From: Jan <jan@horde.org>
Date: Mon, 5 Jul 2010 16:45:41 +0000 (+0100)
Subject: Re-add lost code for %u placeholder in alternate_login.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=d51ba084b50e83353a7efb2d3f4d15ea00c49eb7;p=horde.git

Re-add lost code for %u placeholder in alternate_login.
---

diff --git a/horde/login.php b/horde/login.php
index 78c420fd8..72f537f4a 100644
--- a/horde/login.php
+++ b/horde/login.php
@@ -250,7 +250,13 @@ if (!empty($conf['auth']['alternate_login'])) {
     if (empty($url_in)) {
         $url_in = Horde::selfUrl(true, true, true);
     }
-    $url->add('url', _addAnchor($url_in, 'param', $vars, $url_anchor));
+    $anchor =  _addAnchor($url_in, 'param', $vars, $url_anchor);
+    if (strpos($url, '%25u') || strpos($url, '%u')) {
+        $url = str_replace(array('%25u', '%u'), rawurlencode($anchor), $url);
+
+    } else {
+        $url->add('url', $anchor);
+    }
     header('Location: ' . _addAnchor($url, 'url', $vars, $url_anchor));
     exit;
 }