From: Michael M Slusarz <slusarz@curecanti.org>
Date: Tue, 28 Jul 2009 22:37:19 +0000 (-0600)
Subject: Fix some MIMP menu errors.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=65dc48581451e9f85ffecb118a5eaa20db39a082;p=horde.git

Fix some MIMP menu errors.
---

diff --git a/imp/lib/MIMP.php b/imp/lib/MIMP.php
index baa6e1a57..22f437623 100644
--- a/imp/lib/MIMP.php
+++ b/imp/lib/MIMP.php
@@ -16,12 +16,12 @@ class MIMP
     /**
      * Take a Horde_Mobile_card and add global menu items.
      *
-     * @param Horde_Mobile_linkset &$menu  The menu linkset, with page-specific
-     *                                     options already filled in.
-     * @param string $page                 The current page ('compose',
-     *                                     'folders', 'mailbox', 'message').
+     * @param Horde_Mobile_linkset $menu  The menu linkset, with page-specific
+     *                                    options already filled in.
+     * @param string $page                The current page ('compose',
+     *                                    'folders', 'mailbox', 'message').
      */
-    public function addMIMPMenu(&$menu, $page)
+    public function addMIMPMenu($menu, $page)
     {
         $items = array();
 
@@ -38,17 +38,13 @@ class MIMP
             $items[Horde::applicationUrl('folders-mimp.php')] = _("Folders");
         }
 
-        // @TODO - Options for mobile browsers
-        // if ($options_link = Horde::getServiceLink('options', 'mimp')) {
-        //     $items[Horde_Util::addParameter($options_link, 'mobile', 1, false)] = _("Options");
-        // }
-
-        $items[Horde::getServiceLink('logout')] = _("Log out");
+        $items[Horde::getServiceLink('logout', 'imp')] = _("Log out");
 
         foreach ($items as $link => $label) {
             $menu->add(new Horde_Mobile_link($label, $link));
         }
 
+        $menu = new Horde_Menu();
         foreach ($menu->getSiteLinks() as $menuitem) {
             if ($menuitem != 'separator') {
                 $menu->add(new Horde_Mobile_link($menuitem['text'], $menuitem['url']));