Merge "Fixed User class IDE warnings"

[lhc/web/wiklou.git] / includes / User.php

diff --git a/includes/User.php b/includes/User.php
index 72d6383..8a5e74d 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -838,10 +838,11 @@ class User implements IDBAccessObject {
         * able to set their password to this.
         *
         * @param string $password Desired password
+        * @param string $purpose one of 'login', 'create', 'reset'
         * @return Status
         * @since 1.23
         */
-       public function checkPasswordValidity( $password ) {
+       public function checkPasswordValidity( $password, $purpose = 'login' ) {
                global $wgPasswordPolicy;
 
                $upp = new UserPasswordPolicy(
@@ -858,7 +859,7 @@ class User implements IDBAccessObject {
                }
 
                if ( $result === false ) {
-                       $status->merge( $upp->checkUserPassword( $this, $password ) );
+                       $status->merge( $upp->checkUserPassword( $this, $password, $purpose ) );
                        return $status;
                } elseif ( $result === true ) {
                        return $status;
@@ -4006,7 +4007,6 @@ class User implements IDBAccessObject {
                        return true;
                } elseif ( $wgAuth->strict() ) {
                        // Auth plugin doesn't allow local authentication
-                       wfDebugLog( 'AuthPluginStrict', "Authentication denied for {$this->getName()}" );
                        return false;
                } elseif ( $wgAuth->strictUserAuth( $this->getName() ) ) {
                        // Auth plugin doesn't allow local authentication for this user name