g5 merge 충돌 수정

2013-12-13 09:33:11 +09:00
parent b81c9089d6 6a344d1438
commit 791fb64d25
5 changed files with 51 additions and 36 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -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;