From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 27 Dec 2012 16:35:13 +0000 (+0400)
Subject: place the #357 comment to the correct instance of saveXML(), cleanup old version... 
X-Git-Tag: 1.7.0~94
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=c5bb0440d36a41df615ac03e2d05ef9b8638f280;p=tt-rss.git

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

diff --git a/include/functions.php b/include/functions.php
index 6dc49445..f0bd3183 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2575,6 +2575,7 @@
 
 		$node = $doc->getElementsByTagName('body')->item(0);
 
+		// http://tt-rss.org/redmine/issues/357
 		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) {
 		libxml_use_internal_errors(true);
 
@@ -4726,7 +4716,6 @@
 		$node = $doc->getElementsByTagName('body')->item(0);
 
 		// http://tt-rss.org/forum/viewtopic.php?f=1&t=970
-		// http://tt-rss.org/redmine/issues/357
 		if ($node)
 			return $doc->saveXML($node, LIBXML_NOEMPTYTAG);
 		else