Assume we have a Horde_Url here. Fix encoding of service links.

diff --git a/framework/Core/lib/Horde/Menu.php b/framework/Core/lib/Horde/Menu.php
index 60e02e1..627def7 100644 (file)
--- a/framework/Core/lib/Horde/Menu.php
+++ b/framework/Core/lib/Horde/Menu.php
@@ -248,11 +248,12 @@ class Horde_Menu
 
             /* Link. */
             $accesskey = Horde::getAccessKey($m['text']);
-            $link = Horde::link($m['url'], ($menu_view == 'icon') ? Horde::stripAccessKey($m['text']) : '',
-                                isset($m['class']) ? $m['class'] : '',
-                                isset($m['target']) ? $m['target'] : '',
-                                isset($m['onclick']) ? $m['onclick'] : '',
-                                '', $accesskey);
+            $link = $m['url']->setRaw(false)->link(
+                array('title' => $menu_view == 'icon' ? Horde::stripAccessKey($m['text']) : '',
+                      'class' => isset($m['class']) ? $m['class'] : '',
+                      'target' => $m['target'],
+                      'onclick' => $m['onclick'],
+                      'accesskey' => $accesskey));
 
             $output .= sprintf("\n<li>%s%s%s</a></li>",
                                $link, $icon, ($menu_view != 'icon') ? Horde::highlightAccessKey($m['text'], $accesskey) : '');