Fix link encoding, use Horde_Url#link().

diff --git a/framework/Core/lib/Horde/Help.php b/framework/Core/lib/Horde/Help.php
index c68b9cd..fb006a5 100644 (file)
--- a/framework/Core/lib/Horde/Help.php
+++ b/framework/Core/lib/Horde/Help.php
@@ -213,9 +213,9 @@ class Horde_Help
             return '';
         }
 
-        $url = Horde::getServiceLink('help', $module)->add('topic', $topic)->setRaw(true);
-        return Horde::link($url, _("Help"), 'helplink', 'hordehelpwin', Horde::popupJs($url, array('urlencode' => true)) . 'return false;') .
-            Horde::img('help.png', _("Help"), 'width="16" height="16"') . '</a>';
+        $url = Horde::getServiceLink('help', $module)->add('topic', $topic);
+        return $url->link(array('title' => _("Help"), 'class' => 'helplink', 'target' => 'hordehelpwin', 'onclick' => Horde::popupJs($url, array('urlencode' => true)) . 'return false;'))
+            . Horde::img('help.png', _("Help")) . '</a>';
     }