Merge "resourceloader: Remove module stringification from execute path"

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

diff --git a/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php b/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php
index f5bfc2a..4096f19 100644 (file)
--- a/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/AbstractPasswordPrimaryAuthenticationProvider.php
@@ -53,8 +53,10 @@ abstract class AbstractPasswordPrimaryAuthenticationProvider
         */
        protected function getPasswordFactory() {
                if ( $this->passwordFactory === null ) {
-                       $this->passwordFactory = new PasswordFactory();
-                       $this->passwordFactory->init( $this->config );
+                       $this->passwordFactory = new PasswordFactory(
+                               $this->config->get( 'PasswordConfig' ),
+                               $this->config->get( 'PasswordDefault' )
+                       );
                }
                return $this->passwordFactory;
        }
@@ -113,7 +115,7 @@ abstract class AbstractPasswordPrimaryAuthenticationProvider
         *
         * @param string $username
         * @param Status $status From $this->checkPasswordValidity()
-        * @param mixed $data Passed through to $this->getPasswordResetData()
+        * @param mixed|null $data Passed through to $this->getPasswordResetData()
         */
        protected function setPasswordResetFlag( $username, Status $status, $data = null ) {
                $reset = $this->getPasswordResetData( $username, $data );