jenkins-bot has submitted this change and it was merged.
Change subject: [lockdownSearchableNamespaces] Quickfix for empty $wgUser
......................................................................
[lockdownSearchableNamespaces] Quickfix for empty $wgUser
Patch-Set #2: Changed $wgUser to $user
Change-Id: I1bd8b62c31da8da7cd3779bfedc50e6a31cd3ec0
(cherry picked from commit 0d59ae7a7e0e3eb5a4638ba8f814a57926dada42)
---
M Lockdown.php
1 file changed, 10 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Lockdown.php b/Lockdown.php
index 2660a71..3502028 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -161,14 +161,20 @@
}
function lockdownSearchableNamespaces($arr) {
- global $wgUser, $wgNamespacePermissionLockdown;
+ global $wgNamespacePermissionLockdown;
- //don't continue if $wgUser's name and id are both null (bug 28842)
- if ( $wgUser->getId() === null && $wgUser->getName() === null ) {
+ $user = RequestContext::getMain()->getUser();
+
+ if ( !$user ) {
return true;
}
- $ugroups = $wgUser->getEffectiveGroups( true );;
+ //don't continue if $user's name and id are both null (bug 28842)
+ if ( $user->getId() === null && $user->getName() === null ) {
+ return true;
+ }
+
+ $ugroups = $user->getEffectiveGroups( true );;
foreach ( $arr as $ns => $name ) {
$groups = @$wgNamespacePermissionLockdown[$ns]['read'];
--
To view, visit https://gerrit.wikimedia.org/r/300751
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1bd8b62c31da8da7cd3779bfedc50e6a31cd3ec0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: REL1_27
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Bhofmann <hofm...@hallowelt.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
