From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 23 Mar 2013 06:49:50 +0000 (+0400)
Subject: Revert "title escaping: do not double-encode entities"
X-Git-Tag: 1.7.5~1
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bf1dc420b9490df07c17d9d96b1d48784e448b1a;p=tt-rss.git

Revert "title escaping: do not double-encode entities"

This reverts commit d6ce708930cb838af3ed1cf585d3ca62b7036d9b.
---

diff --git a/classes/feeds.php b/classes/feeds.php
index f6732117..3657a056 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -432,8 +432,7 @@ class Feeds extends Handler_Protected {
 					$reply['content'] .= "<div onclick='return hlClicked(event, $id)'
 						class=\"hlTitle\"><span class='hlContent$hlc_suffix'>";
 					$reply['content'] .= "<a id=\"RTITLE-$id\"
-						href=\"" . htmlspecialchars($line["link"], ENT_COMPAT | ENT_HTML401,
-							'utf-8', false) . "\"
+						href=\"" . htmlspecialchars($line["link"]) . "\"
 						onclick=\"\">" .
 						truncate_string($line["title"], 200);
 
diff --git a/include/functions.php b/include/functions.php
index 2329a233..c01e4100 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3022,8 +3022,7 @@
 
 			if ($line["link"]) {
 				$rv['content'] .= "<div class='postTitle'><a target='_blank'
-					title=\"".htmlspecialchars($line["link"], ENT_COMPAT | ENT_HTML401,
-               'utf-8', false)."\"
+					title=\"".htmlspecialchars($line['title'])."\"
 					href=\"" .
 					htmlspecialchars($line["link"]) . "\">" .
 					$line["title"] . "</a>" .