From ba6f686237f0f634fd3433ce67c2a8bec94b8565 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 31 Aug 2009 17:22:23 -0600
Subject: [PATCH] Bug #8529: Fix generation of URL with pathinfo issue

---
 framework/Core/lib/Horde.php      | 2 +-
 framework/Core/lib/Horde/Menu.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 86276a483..dd664aaaf 100644
--- 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 5402f5c6c..036d17666 100644
--- 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');
                 }
             }
         }
-- 
2.11.0