From 014744444e9b4322968f23bbc40f977a055d7673 Mon Sep 17 00:00:00 2001 From: Xvezda Date: Sun, 5 Apr 2015 18:13:02 +0900 Subject: [PATCH] fix line break bug document --- modules/document/document.controller.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php index 1817e9331..34e6da074 100644 --- a/modules/document/document.controller.php +++ b/modules/document/document.controller.php @@ -295,9 +295,8 @@ class documentController extends document if(substr_compare($editor_config->sel_editor_colorset, 'nohtml', -6) === 0) { - $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); + $obj->content = preg_replace('/\r|\n/', '', nl2br(htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))); } - $obj->content = nl2br($obj->content); } // Remove iframe and script if not a top adminisrator in the session. if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content); @@ -504,9 +503,8 @@ class documentController extends document if(substr_compare($editor_config->sel_editor_colorset, 'nohtml', -6) === 0) { - $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false); + $obj->content = preg_replace('/\r|\n/', '', nl2br(htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false))); } - $obj->content = nl2br($obj->content); } // Change not extra vars but language code of the original document if document's lang_code is different from author's setting. if($source_obj->get('lang_code') != Context::getLangType())