diff --git a/lib/common.lib.php b/lib/common.lib.php index 6e5ac242a..df4ba0736 100644 --- a/lib/common.lib.php +++ b/lib/common.lib.php @@ -2044,12 +2044,14 @@ function bad_tag_convert($code) global $view; global $member, $is_admin; - if ($is_admin && $member['mb_id'] != $view['mb_id']) { + if ($is_admin && $member['mb_id'] !== $view['mb_id']) { //$code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>(\<\/(embed|object)\>)?#i", // embed 또는 object 태그를 막지 않는 경우 필터링이 되도록 수정 $code = preg_replace_callback("#(\<(embed|object)[^\>]*)\>?(\<\/(embed|object)\>)?#i", - create_function('$matches', 'return "
";'), - $code); + function($matches) { + return ""; + }, + $code); } return preg_replace("/\<([\/]?)(script|iframe|form)([^\>]*)\>?/i", "<$1$2$3>", $code); diff --git a/lib/uri.lib.php b/lib/uri.lib.php index 00364af00..5561cd839 100644 --- a/lib/uri.lib.php +++ b/lib/uri.lib.php @@ -91,7 +91,7 @@ function get_pretty_url($folder, $no='', $query_string='', $action='') $url .= ($folder === 'content') ? '?co_id='. $no : '?'. $no; } if($query_string) { - $url .= ($no ? '?' : '&'). $query_string; + $url .= (!$no ? '?' : '&'). $query_string; } }