g5 merge 충돌 수정

This commit is contained in:
chicpro committed 2013-12-13 09:33:11 +09:00
commit 791fb64d25
5 files changed
+51 -36

No files matched your search

+2 -1
View File
@@ -2006,7 +2006,8 @@ function get_editor_image($contents)
return false;
// $contents 중 img 태그 추출
$pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/";
//$pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/";
$pattern = "/<img([^>]*)>/iS";
preg_match_all($pattern, $contents, $matchs);
return $matchs;