jenkins-bot has submitted this change and it was merged.
Change subject: Lockdown should not recache user groups.
......................................................................
Lockdown should not recache user groups.
User groups only need recaching if they were manipulated.
Change-Id: I127fe0c4eddffa73241e27fb3f1d325a3e4cf479
---
M Lockdown.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
Thiemo Mättig (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Lockdown.php b/Lockdown.php
index 3502028..97042e6 100644
--- a/Lockdown.php
+++ b/Lockdown.php
@@ -106,7 +106,7 @@
return false;
}
- $ugroups = $user->getEffectiveGroups( true );;
+ $ugroups = $user->getEffectiveGroups();
$match = array_intersect( $ugroups, $groups );
@@ -145,7 +145,7 @@
return false;
}
- $ugroups = $user->getEffectiveGroups( true );;
+ $ugroups = $user->getEffectiveGroups();
$match = array_intersect( $ugroups, $groups );
if ( $match ) {
@@ -174,7 +174,7 @@
return true;
}
- $ugroups = $user->getEffectiveGroups( true );;
+ $ugroups = $user->getEffectiveGroups();
foreach ( $arr as $ns => $name ) {
$groups = @$wgNamespacePermissionLockdown[$ns]['read'];
@@ -199,7 +199,7 @@
function lockdownTitle(&$title) {
if ( is_object($title) ) {
global $wgUser, $wgNamespacePermissionLockdown;
- $ugroups = $wgUser->getEffectiveGroups( true );;
+ $ugroups = $wgUser->getEffectiveGroups();
$groups =
@$wgNamespacePermissionLockdown[$title->getNamespace()]['read'];
if ( $groups === null ) {
@@ -234,7 +234,7 @@
return true;
}
- $ugroups = $wgUser->getEffectiveGroups( true );;
+ $ugroups = $wgUser->getEffectiveGroups();
foreach ( $searchEngine->namespaces as $key => $ns ) {
$groups = @$wgNamespacePermissionLockdown[$ns]['read'];
--
To view, visit https://gerrit.wikimedia.org/r/303361
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I127fe0c4eddffa73241e27fb3f1d325a3e4cf479
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Lockdown
Gerrit-Branch: master
Gerrit-Owner: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Kghbln <[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
