valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sanitize: move htmlawed rewriting to execute last so that we can keep 

LIBXML_NOEMPTYTAG to prevent stuck tags (which stil occur) and still
not cause duplicate br tags.
This commit is contained in:
Andrew Dolgov 2013-03-17 15:53:42 +04:00
parent 7873d58822
commit 16ad9085ea
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/functions.php
View File

@ -2555,10 +2555,6 @@
$res = trim($str); if (!$res) return ''; $res = trim($str); if (!$res) return '';
$config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
$spec = 'img=width,height';
$res = htmLawed($res, $config, $spec);
if (get_pref($link, "STRIP_IMAGES", $owner)) { if (get_pref($link, "STRIP_IMAGES", $owner)) {
$res = preg_replace('/<img[^>]+>/is', '', $res); $res = preg_replace('/<img[^>]+>/is', '', $res);
} }
@ -2601,7 +2597,13 @@
$node = $doc->getElementsByTagName('body')->item(0); $node = $doc->getElementsByTagName('body')->item(0);
return $doc->saveXML($node); $res = $doc->saveXML($node, LIBXML_NOEMPTYTAG);
$config = array('safe' => 1, 'deny_attribute' => 'style, width, height, class, id', 'comment' => 1, 'cdata' => 1, 'balance' => 0);
$spec = 'img=width,height';
$res = htmLawed($res, $config, $spec);
return $res;
} }
function check_for_update($link) { function check_for_update($link) {