[MediaWiki-commits] [Gerrit] Disable ZeroPortal ext on metawiki - change (operations/mediawiki-config)

2014-10-15 Thread Yurik (Code Review)
Yurik has uploaded a new change for review.

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

Change subject: Disable ZeroPortal ext on metawiki
..

Disable ZeroPortal ext on metawiki

ZeroPortal is no longer hosted on meta, and needs to be deleted.

One possible issue: there were a number of Zero: namespace pages
that used a custom content handler. All these pages have already
been deleted, but there have been some issues with the core
unable to handle missing content models.

Change-Id: I4ad5f91689bce66e33778b34346db98a7e1a6486
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 28 insertions(+), 42 deletions(-)


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

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 63dadf7..c5130af 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2750,55 +2750,42 @@
require_once( $IP/extensions/ZeroBanner/ZeroBanner.php );
require_once( $IP/extensions/ZeroPortal/ZeroPortal.php );
 
-   // Until meta handles ZeroPortal, need to keep it intact
-   if ( $wgDBname == 'zerowiki' ) {
-   // 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'];
+   // 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['*']['createtalk'] = false;
-   $wgGroupPermissions['*']['createpage'] = false;
-   $wgGroupPermissions['*']['writeapi'] = false;
-   $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
+   $wgGroupPermissions['*']['createtalk'] = false;
+   $wgGroupPermissions['*']['createpage'] = false;
+   $wgGroupPermissions['*']['writeapi'] = false;
+   $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
 
-   // fixme: this should go into groupOverrides or 
groupOverrides2, with or without a '+'
-   // 'sysop' = array( 'zero-edit', 'zero-script', 
'zero-script-ips', 'jsonconfig-flush' ),
-   // 'zeroscript' = array( 'zero-script', 'jsonconfig-flush' ),
-   // 'zeroscriptips' = array( 'zero-script-ips', 
'jsonconfig-flush' ),
+   // fixme: this should go into groupOverrides or groupOverrides2, with 
or without a '+'
+   // 'sysop' = array( 'zero-edit', 'zero-script', 'zero-script-ips', 
'jsonconfig-flush' ),
+   // 'zeroscript' = array( 'zero-script', 'jsonconfig-flush' ),
+   // 'zeroscriptips' = array( 'zero-script-ips', 'jsonconfig-flush' ),
 
-   $wgGroupPermissions['sysop']['zero-edit'] = true;
-   $wgGroupPermissions['sysop']['zero-script'] = true;
-   $wgGroupPermissions['sysop']['zero-script-ips'] = true;
-   $wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
-   $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
+   $wgGroupPermissions['sysop']['zero-edit'] = true;
+   $wgGroupPermissions['sysop']['zero-script'] = true;
+   $wgGroupPermissions['sysop']['zero-script-ips'] = true;
+   $wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
+   $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
 
-   $wgGroupPermissions['zeroscript']['zero-script'] = true;
-   $wgGroupPermissions['zeroscript']['jsonconfig-flush'] = true;
-   $wgGroupPermissions['zeroscript'] = 
$wgGroupPermissions['zeroscript'] + $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;
+   $wgGroupPermissions['zeroscriptips']['zero-script-ips'] = true;
+   $wgGroupPermissions['zeroscriptips']['jsonconfig-flush'] = true;
+   $wgGroupPermissions['zeroscriptips'] = 
$wgGroupPermissions['zeroscriptips'] + $zpUserRights;
 
-   $wgZeroPortalImpersonateUser = 'Impersonator';
+   $wgZeroPortalImpersonateUser = 'Impersonator';
 
-   unset( $zpUserRights );
+   unset( $zpUserRights );
 
-   $wgUsersNotifiedOnAllChanges[] = 'ABaso(WMF)';
-   $wgUsersNotifiedOnAllChanges[] = 'Dfoy';
-  

[MediaWiki-commits] [Gerrit] Disable ZeroPortal ext on metawiki - change (operations/mediawiki-config)

2014-10-15 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Disable ZeroPortal ext on metawiki
..


Disable ZeroPortal ext on metawiki

ZeroPortal is no longer hosted on meta, and needs to be deleted.

One possible issue: there were a number of Zero: namespace pages
that used a custom content handler. All these pages have already
been deleted, but there have been some issues with the core
unable to handle missing content models.

Change-Id: I4ad5f91689bce66e33778b34346db98a7e1a6486
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 28 insertions(+), 42 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 63dadf7..c5130af 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2750,55 +2750,42 @@
require_once( $IP/extensions/ZeroBanner/ZeroBanner.php );
require_once( $IP/extensions/ZeroPortal/ZeroPortal.php );
 
-   // Until meta handles ZeroPortal, need to keep it intact
-   if ( $wgDBname == 'zerowiki' ) {
-   // 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'];
+   // 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['*']['createtalk'] = false;
-   $wgGroupPermissions['*']['createpage'] = false;
-   $wgGroupPermissions['*']['writeapi'] = false;
-   $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
+   $wgGroupPermissions['*']['createtalk'] = false;
+   $wgGroupPermissions['*']['createpage'] = false;
+   $wgGroupPermissions['*']['writeapi'] = false;
+   $wgGroupPermissions['user'] = $wgGroupPermissions['*'];
 
-   // fixme: this should go into groupOverrides or 
groupOverrides2, with or without a '+'
-   // 'sysop' = array( 'zero-edit', 'zero-script', 
'zero-script-ips', 'jsonconfig-flush' ),
-   // 'zeroscript' = array( 'zero-script', 'jsonconfig-flush' ),
-   // 'zeroscriptips' = array( 'zero-script-ips', 
'jsonconfig-flush' ),
+   // fixme: this should go into groupOverrides or groupOverrides2, with 
or without a '+'
+   // 'sysop' = array( 'zero-edit', 'zero-script', 'zero-script-ips', 
'jsonconfig-flush' ),
+   // 'zeroscript' = array( 'zero-script', 'jsonconfig-flush' ),
+   // 'zeroscriptips' = array( 'zero-script-ips', 'jsonconfig-flush' ),
 
-   $wgGroupPermissions['sysop']['zero-edit'] = true;
-   $wgGroupPermissions['sysop']['zero-script'] = true;
-   $wgGroupPermissions['sysop']['zero-script-ips'] = true;
-   $wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
-   $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
+   $wgGroupPermissions['sysop']['zero-edit'] = true;
+   $wgGroupPermissions['sysop']['zero-script'] = true;
+   $wgGroupPermissions['sysop']['zero-script-ips'] = true;
+   $wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
+   $wgGroupPermissions['sysop'] = $wgGroupPermissions['sysop'] + 
$zpUserRights;
 
-   $wgGroupPermissions['zeroscript']['zero-script'] = true;
-   $wgGroupPermissions['zeroscript']['jsonconfig-flush'] = true;
-   $wgGroupPermissions['zeroscript'] = 
$wgGroupPermissions['zeroscript'] + $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;
+   $wgGroupPermissions['zeroscriptips']['zero-script-ips'] = true;
+   $wgGroupPermissions['zeroscriptips']['jsonconfig-flush'] = true;
+   $wgGroupPermissions['zeroscriptips'] = 
$wgGroupPermissions['zeroscriptips'] + $zpUserRights;
 
-   $wgZeroPortalImpersonateUser = 'Impersonator';
+   $wgZeroPortalImpersonateUser = 'Impersonator';
 
-   unset( $zpUserRights );
+   unset( $zpUserRights );
 
-   $wgUsersNotifiedOnAllChanges[] = 'ABaso(WMF)';
-   $wgUsersNotifiedOnAllChanges[] = 'Dfoy';
-   $wgUsersNotifiedOnAllChanges[] = 'Jhobs';
-