fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-08 19:21:40 +09:00
Code Issues Projects Releases Packages Wiki Activity

fix line break bug comment

Browse source
This commit is contained in:
Xvezda 2015-04-05 18:11:54 +09:00
parent 863cd6706b
commit 03676ab45c
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/comment/comment.controller.php
View file

@ -333,9 +333,8 @@ class commentController extends comment
if(substr_compare($editor_config->sel_comment_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);
}
if(!$obj->regdate)
@ -747,9 +746,8 @@ class commentController extends comment
if(substr_compare($editor_config->sel_comment_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 administrator on the session