From: Jan Schneider <jan@horde.org>
Date: Tue, 26 Jan 2010 22:59:41 +0000 (+0100)
Subject: Revert "Too many htmlspecialchars in link() for title attribute"
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d255d66a6a8ace592e3a058e455f628cc6aa1faa;p=horde.git

Revert "Too many htmlspecialchars in link() for title attribute"

This reverts commit c92729ed228294b9d29b8a0e73be90e06ff45ab7.

This broke tags that are not properly encoded in title tag anymore, if being used for tooltips, e.g. in the nag portal block.
---

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index ca54bb440..31630801d 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1296,8 +1296,9 @@ HTML;
                 $old_error = error_reporting(0);
                 $title = str_replace(
                     array("\r", "\n"), '',
-                    nl2br(htmlspecialchars($title, ENT_QUOTES, $charset))
-                );
+                    htmlspecialchars(
+                        nl2br(htmlspecialchars($title, ENT_QUOTES, $charset)),
+                        ENT_QUOTES, $charset));
                 error_reporting($old_error);
             }
             $attributes['title.raw'] = $title;