From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 24 Dec 2012 09:53:38 +0000 (+0400)
Subject: prevent escaping of article link in the database when using simplepie (refs #472)
X-Git-Tag: 1.7.0~143
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=1b35d30c1f39c495d1ff2825ccba402bcd8a09fb;p=tt-rss.git

prevent escaping of article link in the database when using simplepie (refs #472)
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index da2f28a9..57413639 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -430,7 +430,8 @@
 				}
 
 				$entry_title = $item->get_title();
-				$entry_link = rewrite_relative_url($site_url, $item->get_link());
+
+				$entry_link = rewrite_relative_url($site_url, htmlspecialchars_decode($item->get_link()));
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: title $entry_title");
@@ -548,15 +549,11 @@
 					$article = $plugin->hook_article_filter($article);
 				}
 
-				$entry_title = $article["title"];
-				$entry_content = $article["content"];
 				$entry_tags = $article["tags"];
-				$entry_author = $article["author"];
-
-				$entry_content = db_escape_string($entry_content, false);
-				$entry_title = db_escape_string($entry_title);
-				$entry_author = db_escape_string($entry_author);
-				$entry_link = db_escape_string($entry_link);
+				$entry_content = db_escape_string($article["content"], false);
+				$entry_title = db_escape_string($article["title"]);
+				$entry_author = db_escape_string($article["author"]);
+				$entry_link = db_escape_string($article["link"]);
 
 				$content_hash = "SHA1:" . sha1(strip_tags($entry_content));