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

잘못 수정한 조건식을 의도에 맞게 수정.

Browse source
This commit is contained in:
MinSoo Kim 2015-05-25 20:12:18 +09:00
parent e445d78dcf
commit a3e307a6d0
1 changed files with 8 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
modules/document/document.controller.php
View file

@ -280,16 +280,13 @@ class documentController extends document
if($obj->title == '') $obj->title = 'Untitled'; if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents. // Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content); $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone()) if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{ {
if($obj->use_editor != 'Y' && $obj->use_html != 'Y') if($obj->use_html != 'Y')
{ {
if($obj->use_html != 'Y') $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
{
$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
}
$obj->content = nl2br($obj->content);
} }
$obj->content = nl2br($obj->content);
} }
// Remove iframe and script if not a top adminisrator in the session. // Remove iframe and script if not a top adminisrator in the session.
if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content); if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
@ -481,16 +478,13 @@ class documentController extends document
if($obj->title == '') $obj->title = 'Untitled'; if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents. // Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content); $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone()) if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{ {
if($obj->use_editor != 'Y' && $obj->use_html != 'Y') if($obj->use_html != 'Y')
{ {
if($obj->use_html != 'Y') $obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
{
$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
}
$obj->content = nl2br($obj->content);
} }
$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. // 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()) if($source_obj->get('lang_code') != Context::getLangType())