Fix propogation of auth error message

diff --git a/framework/Auth/lib/Horde/Auth/Application.php b/framework/Auth/lib/Horde/Auth/Application.php
index ea8268e..9747f30 100644 (file)
--- 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 c6104e7..9d63bc2 100644 (file)
--- 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 '';