Merge branch 'g5'

2014-03-28 16:17:00 +09:00
parent 2b23e4c90c 83fe14288a
commit c83266d0f0
6 changed files with 103 additions and 11 deletions
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@ -510,7 +510,7 @@ function conv_subject($subject, $len, $suffix='')
 }

 // 내용을 변환
-function conv_content($content, $html)
+function conv_content($content, $html, $filter=true)
 {
    global $config, $board;

@ -536,7 +536,9 @@ function conv_content($content, $html)
        }

        $content = preg_replace($source, $target, $content);
-        $content = html_purifier($content);
+
+        if($filter)
+            $content = html_purifier($content);
    }
    else // text 이면
    {