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

Merge #1495 모바일 환경에서도 에디터를 사용할 수 있는 기반 PR by misol

Browse source 
* pr/1495:
  댓글에서도 에디터를 쓸 수 있는 설정을 만들어둡니다.
  잘못 수정한 조건식을 의도에 맞게 수정.
  모바일에서도 에디터를 쓸 수 있도록 합니다.
This commit is contained in:
Kijin Sung 2015-10-08 14:16:43 +09:00
commit 84cfd383d0
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -322,7 +322,7 @@ class commentController extends comment
// 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())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{
@ -741,7 +741,7 @@ 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(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{

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())
if(Mobile::isFromMobilePhone() && $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())
if(Mobile::isFromMobilePhone() && $obj->use_editor != 'Y')
{
if($obj->use_html != 'Y')
{