jenkins-bot has submitted this change and it was merged.

Change subject: Fix retrieval of the effective user groups
......................................................................


Fix retrieval of the effective user groups

Restores compatibility with MediaWiki 1.27+. Patch provided by user
Javawookie (https://phabricator.wikimedia.org/p/Javawookie/)

Bug: T137051
Change-Id: Ia19982f764c53395c7fb32d12d7aab669bbbeef4
---
M Lockdown.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Kghbln: Looks good to me, but someone else must approve
  Daniel Kinzler: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Lockdown.php b/Lockdown.php
index 3502028..5cd0621 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -58,6 +58,8 @@
 function lockdownUserPermissionsErrors( $title, $user, $action, &$result ) {
        global $wgNamespacePermissionLockdown, $wgSpecialPageLockdown, 
$wgWhitelistRead, $wgLang;
 
+       $ugroups = $user->getEffectiveGroups( true );
+
        $result = null;
 
        // don't impose extra restrictions on UI pages
@@ -105,8 +107,6 @@
 
                return false;
        }
-
-       $ugroups = $user->getEffectiveGroups( true );;
 
        $match = array_intersect( $ugroups, $groups );
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia19982f764c53395c7fb32d12d7aab669bbbeef4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: REL1_27
Gerrit-Owner: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Daniel Kinzler <daniel.kinz...@wikimedia.de>
Gerrit-Reviewer: Kghbln <kars...@hoffmeyer.info>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to