X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fpassword%2FUserPasswordPolicy.php;h=bf1f8acfb7d3aa48757cb39e47864d4b2f91486d;hb=2b2f9e229d2772d680393c1e7d7e4a41dae5b114;hp=5584f6f1628f8d79a6de7db52a2de8dbdebac6da;hpb=3071f1fad720f1773864621158a0c59b73124896;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/password/UserPasswordPolicy.php b/includes/password/UserPasswordPolicy.php
index 5584f6f162..bf1f8acfb7 100644
--- a/includes/password/UserPasswordPolicy.php
+++ b/includes/password/UserPasswordPolicy.php
@@ -67,12 +67,11 @@ class UserPasswordPolicy {
 	 * Check if a passwords meets the effective password policy for a User.
 	 * @param User $user who's policy we are checking
 	 * @param string $password the password to check
-	 * @param string $purpose one of 'login', 'create', 'reset'
 	 * @return Status error to indicate the password didn't meet the policy, or fatal to
 	 *	indicate the user shouldn't be allowed to login.
 	 */
-	public function checkUserPassword( User $user, $password, $purpose = 'login' ) {
-		$effectivePolicy = $this->getPoliciesForUser( $user, $purpose );
+	public function checkUserPassword( User $user, $password ) {
+		$effectivePolicy = $this->getPoliciesForUser( $user );
 		return $this->checkPolicies(
 			$user,
 			$password,
@@ -134,20 +133,16 @@ class UserPasswordPolicy {
 	 * Get the policy for a user, based on their group membership. Public so
 	 * UI elements can access and inform the user.
 	 * @param User $user
-	 * @param string $purpose one of 'login', 'create', 'reset'
 	 * @return array the effective policy for $user
 	 */
-	public function getPoliciesForUser( User $user, $purpose = 'login' ) {
-		$effectivePolicy = $this->policies['default'];
-		if ( $purpose !== 'create' ) {
-			$effectivePolicy = self::getPoliciesForGroups(
-				$this->policies,
-				$user->getEffectiveGroups(),
-				$this->policies['default']
-			);
-		}
+	public function getPoliciesForUser( User $user ) {
+		$effectivePolicy = self::getPoliciesForGroups(
+			$this->policies,
+			$user->getEffectiveGroups(),
+			$this->policies['default']
+		);
 
-		Hooks::run( 'PasswordPoliciesForUser', [ $user, &$effectivePolicy, $purpose ] );
+		Hooks::run( 'PasswordPoliciesForUser', [ $user, &$effectivePolicy ] );
 
 		return $effectivePolicy;
 	}