From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 8 Sep 2009 21:55:03 +0000 (-0600)
Subject: Fix escaping title (tooltip) text
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=a1ba596addce9de898ff5df0d00ca5025bfea02a;p=horde.git

Fix escaping title (tooltip) text
---

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 28b15b28c..09bb92b98 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1314,7 +1314,7 @@ HTML;
      * @param string $class      The CSS class of the link
      * @param string $target     The window target to point to.
      * @param string $onclick    JavaScript action for the 'onclick' event.
-     * @param string $title      The link title (tooltip).
+     * @param string $title      The link title (tooltip). Unescaped.
      * @param string $accesskey  The access key to use.
      * @param array  $attributes Any other name/value pairs to add to the <a>
      *                           tag.
@@ -1327,10 +1327,7 @@ HTML;
                                        $attributes = array())
     {
         if (!empty($title)) {
-            $charset = Horde_Nls::getCharset();
-            $old_error = error_reporting(0);
-            $title = '&lt;pre&gt;' . preg_replace(array('/\n/', '/((?<!<br)\s{1,}(?<!\/>))/em', '/<br \/><br \/>/', '/<br \/>/'), array('', 'str_repeat("&nbsp;", strlen("$1"))', '&lt;br /&gt; &lt;br /&gt;', '&lt;br /&gt;'), nl2br(htmlspecialchars(htmlspecialchars($title, ENT_QUOTES, $charset), ENT_QUOTES, $charset))) . '&lt;/pre&gt;';
-            error_reporting($old_error);
+            $title = htmlspecialchars($title, ENT_QUOTES, Horde_Nls::getCharset());
         }
 
         return self::link($url, $title, $class, $target, $onclick, null, $accesskey, $attributes, false);