Merge "Add NS_MAIN to NamespaceInfo::$canonicalNames"

[lhc/web/wiklou.git] / includes / auth / LocalPasswordPrimaryAuthenticationProvider.php

diff --git a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
index b646380..aebfb22 100644 (file)
--- a/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/LocalPasswordPrimaryAuthenticationProvider.php
@@ -113,11 +113,7 @@ class LocalPasswordPrimaryAuthenticationProvider
                // Check for *really* old password hashes that don't even have a type
                // The old hash format was just an md5 hex hash, with no type information
                if ( preg_match( '/^[0-9a-f]{32}$/', $row->user_password ) ) {
-                       if ( $this->config->get( 'PasswordSalt' ) ) {
-                               $row->user_password = ":B:{$row->user_id}:{$row->user_password}";
-                       } else {
-                               $row->user_password = ":A:{$row->user_password}";
-                       }
+                       $row->user_password = ":B:{$row->user_id}:{$row->user_password}";
                }
 
                $status = $this->checkPasswordValidity( $username, $req->password );
@@ -199,7 +195,7 @@ class LocalPasswordPrimaryAuthenticationProvider
                list( $db, $options ) = \DBAccessObjectUtils::getDBOptions( $flags );
                return (bool)wfGetDB( $db )->selectField(
                        [ 'user' ],
-                       [ 'user_id' ],
+                       'user_id',
                        [ 'user_name' => $username ],
                        __METHOD__,
                        $options