summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2013-03-23 10:49:50 +0400
committerAndrew Dolgov <[email protected]>2013-03-23 10:49:50 +0400
commitbf1dc420b9490df07c17d9d96b1d48784e448b1a (patch)
treeeaf4d749d9100f4a47a3bda7d2a5fd29448eabf3
parent99534a3dde1bd488c193d84c11a0a886bee0fda4 (diff)
Revert "title escaping: do not double-encode entities"
This reverts commit d6ce708930cb838af3ed1cf585d3ca62b7036d9b.
-rw-r--r--classes/feeds.php3
-rw-r--r--include/functions.php3
2 files changed, 2 insertions, 4 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index f67321177..3657a0564 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 2329a2331..c01e41004 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>" .