From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sat, 3 Jul 2010 22:39:01 +0000 (-0400)
Subject: fix link generation for admin and options links
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=581c2bc8eb691539415ddc22de488156655c25a8;p=horde.git

fix link generation for admin and options links
---

diff --git a/horde/services/portal/sidebar.php b/horde/services/portal/sidebar.php
index d4d7e9c2f..34c49aa54 100644
--- a/horde/services/portal/sidebar.php
+++ b/horde/services/portal/sidebar.php
@@ -132,7 +132,7 @@ function buildMenu()
                     'icon' => (string)$icon,
                     'status' => 'active',
                     'menu_parent' => 'administration',
-                    'url' => Horde::url($registry->applicationWebPath($vals['link'])),
+                    'url' => Horde::url($registry->applicationWebPath($vals['link']), 'horde'),
                     );
             }
         } catch (Horde_Exception $e) {}
@@ -174,7 +174,7 @@ function buildMenu()
                                                 'status' => 'active',
                                                 'menu_parent' => 'options',
                                                 'icon' => (string)$registry->get('icon', 'horde'),
-                                                'url' => Horde::applicationUrl('services/prefs.php?app=horde'));
+                                                'url' => Horde::url($registry->get('webroot', 'horde') . '/services/prefs.php?app=horde'));
             unset($prefs_apps['horde']);
         }
 
@@ -184,7 +184,7 @@ function buildMenu()
                                              'status' => 'active',
                                              'menu_parent' => 'options',
                                              'icon' => (string)$registry->get('icon', $app),
-                                             'url' => Horde::applicationUrl('services/prefs.php?app=' . $app));
+                                             'url' => Horde::url($registry->get('webroot', 'horde') . '/services/prefs.php?app=' . $app));
         }
     }