Merge branch 'master' of github.com:gnuboard/g4s

2013-03-20 16:01:43 +09:00
parent b072f9fe23 ee456e5e4c
commit d84aea2012
7 changed files with 83 additions and 29 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -1753,7 +1753,7 @@ function get_editor_image($contents)
        return false;

    // $contents 중 img 태그 추출
-    $pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+".str_replace(".", "\.", $_SERVER['HTTP_HOST'])."[^>\'\"]+)[\'\"]?[^>]*>/";
+    $pattern = "/<img[^>]*src=[\'\"]?([^>\'\"]+[^>\'\"]+)[\'\"]?[^>]*>/";
    preg_match_all($pattern, $contents, $matchs);

    return $matchs;