From bfbcd10b9f652bc0e08c360abaa2f61e94c987fc Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 22 Jul 2009 16:08:15 -0600 Subject: [PATCH] Fix parameter generation for app name. --- framework/Auth/lib/Horde/Auth.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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) { -- 2.11.0