From 30f273fcad30eefd9b474cf53c2c851997302767 Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Wed, 14 Apr 2010 00:23:10 -0600 Subject: [PATCH] Fix propogation of auth error message --- framework/Auth/lib/Horde/Auth/Application.php | 6 +----- horde/login.php | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/Auth/lib/Horde/Auth/Application.php b/framework/Auth/lib/Horde/Auth/Application.php index ea8268e89..9747f3051 100644 --- a/framework/Auth/lib/Horde/Auth/Application.php +++ b/framework/Auth/lib/Horde/Auth/Application.php @@ -119,11 +119,7 @@ class Horde_Auth_Application extends Horde_Auth_Base $credentials['auth_ob'] = $this; - try { - $result = $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['authenticate'], array('args' => array($userId, $credentials), 'noperms' => true)); - } catch (Horde_Auth_Exception $e) { - throw new Horde_Auth_Exception('', Horde_Auth::REASON_BADLOGIN); - } + $GLOBALS['registry']->callAppMethod($this->_app, $this->_apiMethods['authenticate'], array('args' => array($userId, $credentials), 'noperms' => true)); } /** diff --git a/horde/login.php b/horde/login.php index c6104e71d..9d63bc238 100644 --- a/horde/login.php +++ b/horde/login.php @@ -63,7 +63,11 @@ function _getLogoutReasonString($code) return _("Your login has expired."); case Horde_Auth::REASON_MESSAGE: - return Horde_Util::getFormData(Horde_Auth::REASON_MSG_PARAM); + $msg = Horde_Auth::getAuthError(true); + if (!$msg) { + Horde_Util::getFormData(Horde_Auth::REASON_MSG_PARAM); + } + return $msg; default: return ''; -- 2.11.0