From b85b7b18e0278a41a9d69d0dad1a7516e827bf59 Mon Sep 17 00:00:00 2001 From: sungbum hong Date: Tue, 8 Jul 2014 13:50:08 +0900 Subject: [PATCH 01/24] fix typo --- classes/object/Object.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php index aadf61e72..ed5a76bcf 100644 --- a/classes/object/Object.class.php +++ b/classes/object/Object.class.php @@ -165,7 +165,7 @@ class Object } /** - * Method to retrieve an object containing a key/value paris + * Method to retrieve an object containing a key/value pairs * * @return Object Returns an object containing key/value pairs */ From b5c23ae116572e2cbb8f29c68243a4b9795c0dab Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Thu, 17 Jul 2014 04:37:09 +0900 Subject: [PATCH 02/24] 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 69124bc02cfce8956b4e43a4b1b0097f9c1fd6ed Mon Sep 17 00:00:00 2001 From: sejin7940 Date: Thu, 17 Jul 2014 07:39:56 +0900 Subject: [PATCH 03/24] Update editor.model.php --- modules/editor/editor.model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php index ded9da79c..9234a1d5c 100644 --- a/modules/editor/editor.model.php +++ b/modules/editor/editor.model.php @@ -424,7 +424,7 @@ class editorModel extends editor else $option->enable_component = true; // HTML editing privileges $enable_html = false; - if($logged_info->is_admin=='Y') $option->enable_html = true; + if($logged_info->is_admin=='Y') $enable_html = true; elseif(count($config->enable_html_grant)) { foreach($group_list as $group_srl => $group_info) From be89e4939d6ac190e34e5a2e6e16a2660a3d29dd Mon Sep 17 00:00:00 2001 From: akasima Date: Thu, 17 Jul 2014 12:05:51 +0900 Subject: [PATCH 04/24] =?UTF-8?q?#849=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20'=EA=B3=A0=EA=B8=89'=ED=83=AD=EC=9D=B4=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=99=9C=EC=84=B1=ED=99=94=20=EB=90=98?= =?UTF-8?q?=EB=A1=9D=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/board/tpl/board_insert.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html index 7230737e3..0a828fe11 100644 --- a/modules/board/tpl/board_insert.html +++ b/modules/board/tpl/board_insert.html @@ -137,7 +137,7 @@ -