Swap if / elseif

https://github.com/friendica/friendica/pull/4782#discussion_r179947984

diff --git a/src/Model/User.php b/src/Model/User.php
index 6178906aa278d5bdc0a192dba214139fbc01accb..27f7ff66f7ebc348b9e839a77d0e37462e508063 100644 (file)
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -127,18 +127,18 @@ class User
        {
                $user = self::getAuthenticationInfo($user_info);
 
-               if (password_verify($password, $user['password'])) {
-                       if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
-                               self::updatePassword($user['uid'], $password);
-                       }
-
-                       return $user['uid'];
-               } elseif (strpos($user['password'], '$') === false) {
+               if (strpos($user['password'], '$') === false) {
                        if (self::hashPasswordLegacy($password) === $user['password']) {
                                self::updatePassword($user['uid'], $password);
 
                                return $user['uid'];
                        }
+               } elseif (password_verify($password, $user['password'])) {
+                       if (password_needs_rehash($user['password'], PASSWORD_DEFAULT)) {
+                               self::updatePassword($user['uid'], $password);
+                       }
+
+                       return $user['uid'];
                }
 
                throw new Exception(L10n::t('Login failed'));