From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 22 Jul 2009 22:08:15 +0000 (-0600)
Subject: Fix parameter generation for app name.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=bfbcd10b9f652bc0e08c360abaa2f61e94c987fc;p=horde.git

Fix parameter generation for app name.
---

diff --git a/framework/Auth/lib/Horde/Auth.php b/framework/Auth/lib/Horde/Auth.php
index 8c5b41d20..f9c9b4a9e 100644
--- a/framework/Auth/lib/Horde/Auth.php
+++ b/framework/Auth/lib/Horde/Auth.php
@@ -500,12 +500,8 @@ class Horde_Auth
             $options['reason'] = self::getAuthError();
         }
 
-        if (isset($options['app'])) {
-            $params['app'] = $options['app'];
-        }
-
-        if (empty($params['app']) ||
-            ($params['app'] == 'horde') ||
+        if (empty($options['app']) ||
+            ($options['app'] == 'horde') ||
             ($options['reason'] == self::REASON_LOGOUT)) {
             $params = array(
                 'horde_logout_token' => Horde::getRequestToken('horde.logout'),
@@ -517,6 +513,10 @@ class Horde_Auth
             );
         }
 
+        if (isset($options['app'])) {
+            $params['app'] = $options['app'];
+        }
+
         if ($options['reason']) {
             $params[self::REASON_PARAM] = $options['reason'];
             if ($options['reason'] == self::REASON_MESSAGE) {