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

This reverts commit d6ce708930cb838af3ed1cf585d3ca62b7036d9b.

diff --git a/classes/feeds.php b/classes/feeds.php
index f673211774b25a41e28ae1d0e43383341491fc1f..3657a0564caa247cc91e9d0c0fb186c44506b45e 100644 (file)
--- 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 2329a2331c6acaa390e1bc0519e4641a84b9ea48..c01e4100437886997ddd86423ff3c07f830cf1ff 100644 (file)
--- 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>" .