jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/372767 )

Change subject: Password reset link is shown when no reset options are available
......................................................................


Password reset link is shown when no reset options are available

This is just to retrospectively apply 313853 to the 1_27 branch

Bug: T144705
Bug: T148662
Change-Id: I7d6b563e32039e7313121de9629f02ad4f02d351
(cherry picked from commit 183f0bd5e382ae67707a4829c482649e1fa83bf9)
---
M includes/specialpage/LoginSignupSpecialPage.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Huji: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved
  Zoranzoki21: Looks good to me, but someone else must approve



diff --git a/includes/specialpage/LoginSignupSpecialPage.php 
b/includes/specialpage/LoginSignupSpecialPage.php
index 1e6bdc7..76e1748 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -704,7 +704,7 @@
 
                if ( !$this->isSignup() && $this->showExtraInformation() ) {
                        $passwordReset = new PasswordReset( $this->getConfig(), 
AuthManager::singleton() );
-                       if ( $passwordReset->isAllowed( $this->getUser() ) ) {
+                       if ( $passwordReset->isAllowed( $this->getUser() 
)->isGood() ) {
                                $form->addFooterText( Html::rawElement(
                                        'div',
                                        [ 'class' => 'mw-ui-vform-field 
mw-form-related-link-container' ],

-- 
To view, visit https://gerrit.wikimedia.org/r/372767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d6b563e32039e7313121de9629f02ad4f02d351
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: REL1_27
Gerrit-Owner: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Huji <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to