jenkins-bot has submitted this change and it was merged.
Change subject: Prevent fatal error if $wgCookieSetOnAutoblock is changed to
false
......................................................................
Prevent fatal error if $wgCookieSetOnAutoblock is changed to false
... and user still has a block cookie set.
Bug: T151097
Change-Id: I5a2fdc53250f629579428efbed39f6fb1f1531f3
---
M includes/user/User.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/user/User.php b/includes/user/User.php
index 789c55c..82d8806 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1649,7 +1649,7 @@
// If the block is not valid, clear the
block cookie (but don't delete it,
// because it needs to be cleared from
LocalStorage as well and an empty string
// value is checked for in the
mediawiki.user.blockcookie module).
- $block->setCookie(
$this->getRequest()->response(), true );
+ $tmpBlock->setCookie(
$this->getRequest()->response(), true );
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/322377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a2fdc53250f629579428efbed39f6fb1f1531f3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Kaldari <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MusikAnimal <[email protected]>
Gerrit-Reviewer: Niharika29 <[email protected]>
Gerrit-Reviewer: Samwilson <[email protected]>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
