MaxSem has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/159812

Change subject: Revert "Custom rights on zerowiki"
......................................................................

Revert "Custom rights on zerowiki"

This reverts commit 27b7d1650f1e4478bfc56d67d0791d39e89245a1.

Change-Id: Ief2971a44ee5204b62c61295ca3db5040b0728f1
---
M wmf-config/CommonSettings.php
1 file changed, 2 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/159812/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4804403..ca582ff 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2694,27 +2694,17 @@
        require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" );
        require_once( "$IP/extensions/ZeroPortal/ZeroPortal.php" );
 
-       // zerowiki treats all logged-in users the same as anonymous, without 
giving them any extra rights
-       // Only sysops and scripts get additional rights on zerowiki
-       $zpUserRights = $wgGroupPermissions['user'];
-       $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
-       $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
+       // 2014-7-1 this line can be deleted once ZeroPortal goes into prod - 
redundant
+       $wgJsonConfigs['JsonZeroConfig']['store'] = true;
 
        $wgGroupPermissions['zeroadmin']['zero-edit'] = true;
        $wgGroupPermissions['zeroadmin']['zero-script'] = true;
        $wgGroupPermissions['zeroadmin']['zero-script-ips'] = true;
        $wgGroupPermissions['zeroadmin']['jsonconfig-flush'] = true;
-       $wgGroupPermissions['zeroadmin'] = $wgGroupPermissions['zeroadmin'] + 
$zpUserRights;
-
        $wgGroupPermissions['zeroscript']['zero-script'] = true;
        $wgGroupPermissions['zeroscript']['jsonconfig-flush'] = true;
-       $wgGroupPermissions['zeroscript'] = $wgGroupPermissions['zeroscript'] + 
$zpUserRights;
-
        $wgGroupPermissions['zeroscriptips']['zero-script-ips'] = true;
        $wgGroupPermissions['zeroscriptips']['jsonconfig-flush'] = true;
-       $wgGroupPermissions['zeroscriptips'] = 
$wgGroupPermissions['zeroscriptips'] + $zpUserRights;
-
-       unset( $zpUserRights );
 }
 
 if ( $wmgUseGraph ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief2971a44ee5204b62c61295ca3db5040b0728f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MaxSem <[email protected]>

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

Reply via email to