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

Revert "Revert "0848f2ad3c 보완""

Browse source 
This reverts commit 5ecb1241ca.
This commit is contained in:
Kijin Sung 2018-08-26 23:21:52 +09:00
parent 5ecb1241ca
commit b7d38f0294
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/document/document.item.php
View file

@ -552,7 +552,7 @@ class documentItem extends BaseObject
$content = cut_str($content, $strlen, '...');
}
return escape($content, false);
return escape($content);
}
function getContentText($strlen = 0)
@ -570,14 +570,13 @@ class documentItem extends BaseObject
$content = $this->get('content');
$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
if($strlen)
{
$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
$content = cut_str($content, $strlen, '...');
}
return escape($content, false);
return escape($content);
}
function _addAllowScriptAccess($m)