public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-18 23:11:29 +00:00
Code Issues Releases Wiki Activity

place the #357 comment to the correct instance of saveXML(), cleanup old version of rewrite_urls()

Browse Source
This commit is contained in:
Andrew Dolgov
2012-12-27 20:35:13 +04:00
parent e9c04fd4e3
commit c5bb0440d3
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/functions.php
View File

@@ -2575,6 +2575,7 @@
$node = $doc->getElementsByTagName('body')->item(0); $node = $doc->getElementsByTagName('body')->item(0);
// http://tt-rss.org/redmine/issues/357
return $doc->saveXML($node, LIBXML_NOEMPTYTAG); return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
} }
@@ -4675,17 +4676,6 @@
} }
/* function rewrite_urls($line) {
global $url_regex;
$urls = null;
$result = preg_replace("/((?<!=.)((http|https|ftp)+):\/\/[^ ,!]+)/i",
"<a target=\"_blank\" href=\"\\1\">\\1</a>", $line);
return $result;
} */
function rewrite_urls($html) { function rewrite_urls($html) {
libxml_use_internal_errors(true); libxml_use_internal_errors(true);
@@ -4726,7 +4716,6 @@
$node = $doc->getElementsByTagName('body')->item(0); $node = $doc->getElementsByTagName('body')->item(0);
// http://tt-rss.org/forum/viewtopic.php?f=1&t=970 // http://tt-rss.org/forum/viewtopic.php?f=1&t=970
// http://tt-rss.org/redmine/issues/357
if ($node) if ($node)
return $doc->saveXML($node, LIBXML_NOEMPTYTAG); return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
else else