Merge "Fix handling of error messages from the 'SpecialPasswordResetOnSubmit' hook"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 16 Jun 2016 16:58:29 +0000 (16:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 16 Jun 2016 16:58:29 +0000 (16:58 +0000)
includes/user/PasswordReset.php

index 60144bb..bc87cd0 100644 (file)
@@ -153,7 +153,7 @@ class PasswordReset {
                        'Capture' => $displayPassword ? '1' : null,
                ];
                if ( !Hooks::run( 'SpecialPasswordResetOnSubmit', [ &$users, $data, &$error ] ) ) {
-                       return StatusValue::newFatal( wfMessage( $error ) );
+                       return StatusValue::newFatal( Message::newFromSpecifier( $error ) );
                }
 
                if ( !$users ) {