From: Michael Rubinsky <mrubinsk@simon.horde.org>
Date: Sun, 15 Aug 2010 15:27:06 +0000 (+0000)
Subject: Avoid adding redundant slashes when building selfUrl.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=3cceb2d86d85c370aba3baa16d94d40f34bf9f43;p=horde.git

Avoid adding redundant slashes when building selfUrl.

This fixes broken url parameters when using pretty urls. For example,
the url parameter to the login link.
---

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index bed85ee89..c4f782ea9 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -1285,7 +1285,7 @@ HTML;
 
         if ($script_params) {
             if ($pathInfo = Horde_Util::getPathInfo()) {
-                $url .= '/' . $pathInfo;
+                $url .= (strrpos($url, '/') !== (strlen($url) - 1) ?  '/' : '')  . $pathInfo;
             }
             if (!empty($_SERVER['QUERY_STRING'])) {
                 $url .= '?' . $_SERVER['QUERY_STRING'];