update event19573

update event

2 files changed, 10 insertions, 10 deletions

diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index fb54e81250..76579d69d4 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -572,7 +572,11 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
             }
 
             // validate password
-            $error = UsersManager::checkPassword($password, true);
+            try {
+                UsersManager::checkPassword($password);
+            } catch (\Exception $e) {
+                $error = $e->getMessage();
+            }
 
             // confirm matching passwords
             if ($password !== $passwordConfirmation) {
diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php
index 3033ee7624..7cdd768c67 100644
--- a/plugins/UsersManager/UsersManager.php
+++ b/plugins/UsersManager/UsersManager.php
@@ -153,7 +153,7 @@ class UsersManager extends \Piwik\Plugin
         return $l >= self::PASSWORD_MIN_LENGTH;
     }
 
-    public static function checkPassword($password, $returnError = false)
+    public static function checkPassword($password)
     {
         /**
          * Triggered before core password validator check password.
@@ -171,21 +171,17 @@ class UsersManager extends \Piwik\Plugin
          *
          * @param string $password Checking password in plain text.
          */
-        $error = null;
 
         Piwik::postEvent('UsersManager.checkPassword', array($password));
 
         if (!self::isValidPasswordString($password)) {
-            $error = Piwik::translate('UsersManager_ExceptionInvalidPassword', array(self::PASSWORD_MIN_LENGTH));
+            throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidPassword',
+                array(self::PASSWORD_MIN_LENGTH)));
         }
         if (mb_strlen($password) > self::PASSWORD_MAX_LENGTH) {
-            $error = Piwik::translate('UsersManager_ExceptionInvalidPasswordTooLong',
-                array(self::PASSWORD_MAX_LENGTH));
+            throw new Exception(Piwik::translate('UsersManager_ExceptionInvalidPasswordTooLong',
+                array(self::PASSWORD_MAX_LENGTH)));
         }
-        if ($error && !$returnError) {
-            throw new Exception($error);
-        }
-        return $error;
     }
 
     public static function getPasswordHash($password)