Bug #8529: Fix generation of URL with pathinfo issue

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 86276a4..dd664aa 100644 (file)
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1393,7 +1393,7 @@ HTML;
 
         if ($script_params) {
             if ($pathInfo = Horde_Util::getPathInfo()) {
-                $url .= $pathInfo;
+                $url .= '/' . $pathInfo;
             }
             if (!empty($_SERVER['QUERY_STRING'])) {
                 $url .= '?' . $_SERVER['QUERY_STRING'];

diff --git a/framework/Core/lib/Horde/Menu.php b/framework/Core/lib/Horde/Menu.php
index 5402f5c..036d176 100644 (file)
--- a/framework/Core/lib/Horde/Menu.php
+++ b/framework/Core/lib/Horde/Menu.php
@@ -191,7 +191,7 @@ class Horde_Menu
                 }
             } else {
                 if ($login_link = Horde::getServiceLink('login', $app)) {
-                    $this->add(Horde_Util::addParameter($login_link, array('url' => Horde::selfUrl(true))), _("_Log in"), 'login.png', $graphics, $auth_target, null, '__noselection');
+                    $this->add(Horde_Util::addParameter($login_link, array('url' => Horde::selfUrl(true, true, true))), _("_Log in"), 'login.png', $graphics, $auth_target, null, '__noselection');
                 }
             }
         }