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

Merge #1529 매뉴얼 인서트에서는 글이나 댓글을 변형하지 않도록 하는 PR by misol

Browse source 
* pr/1529:
  Do not, at comment either.
  Do not modify document when it is a manual inserted document

Conflicts:
	modules/comment/comment.controller.php
	modules/document/document.controller.php
This commit is contained in:
Kijin Sung 2015-10-08 15:00:18 +09:00
commit 07e78dcc43
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -281,7 +281,7 @@ class documentController extends document
if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
if(Mobile::isFromMobilePhone() && !$manual_inserted && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
@ -491,7 +491,7 @@ class documentController extends document
if($obj->title == '') $obj->title = 'Untitled';
// Remove XE's own tags from the contents.
$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
if(Mobile::isFromMobilePhone() && !$manual_inserted && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{