From b5c23ae116572e2cbb8f29c68243a4b9795c0dab Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Thu, 17 Jul 2014 04:37:09 +0900 Subject: [PATCH 1/2] Update comment.controller.php --- modules/comment/comment.controller.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 563e5ac03..9762ac69b 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -711,6 +711,15 @@ class commentController extends comment // remove XE's wn tags from contents $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content); + if(Mobile::isFromMobilePhone()) + { + if($obj->use_html != 'Y') + { + $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); + } + $obj->content = nl2br($obj->content); + } + // remove iframe and script if not a top administrator on the session if($logged_info->is_admin != 'Y') { From 9a3eab0bdae343b4337c78e1b576ee4cbe2716e9 Mon Sep 17 00:00:00 2001 From: akasima Date: Thu, 31 Jul 2014 10:07:40 +0900 Subject: [PATCH 2/2] =?UTF-8?q?Revert=20"#847=20=EB=AA=A8=EB=B0=94?= =?UTF-8?q?=EC=9D=BC(=EB=98=90=EB=8A=94=20textarea=ED=98=95)=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EB=8C=93=EA=B8=80=20=EC=88=98=EC=A0=95=EC=8B=9C=20?= =?UTF-8?q?=EC=A4=84=EB=B0=94=EA=BF=88=20=EC=9C=A0=EC=A7=80=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/comment/comment.controller.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php index 9762ac69b..563e5ac03 100644 --- a/modules/comment/comment.controller.php +++ b/modules/comment/comment.controller.php @@ -711,15 +711,6 @@ class commentController extends comment // remove XE's wn tags from contents $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content); - if(Mobile::isFromMobilePhone()) - { - if($obj->use_html != 'Y') - { - $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); - } - $obj->content = nl2br($obj->content); - } - // remove iframe and script if not a top administrator on the session if($logged_info->is_admin != 'Y') {