Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315854
Change subject: Revert "Hack for making sure $wgJsonConfigs['JsonZeroConfig']
is set late enough"
......................................................................
Revert "Hack for making sure $wgJsonConfigs['JsonZeroConfig'] is set late
enough"
This reverts commit 1474b4bd99ea36fa19c51dba62faafa3913c3cc1.
Change-Id: I833693f4995316ab032da6da444ec3af53b34269
---
M wmf-config/mobile.php
1 file changed, 6 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/54/315854/1
diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php
index 275e575..7a84ddd 100644
--- a/wmf-config/mobile.php
+++ b/wmf-config/mobile.php
@@ -34,16 +34,12 @@
require_once( "$IP/extensions/JsonConfig/JsonConfig.php" );
require_once( "$IP/extensions/ZeroBanner/ZeroBanner.php" );
- // HACK
- $wgExtensionFunctions[] = function () {
- global $wgJsonConfigs, $wmgZeroPortalApiUserName,
$wmgZeroPortalApiPassword;
- $wgJsonConfigs['JsonZeroConfig']['isLocal'] = false;
- $wgJsonConfigs['JsonZeroConfig']['remote'] = [
- 'url' => 'https://zero.wikimedia.org/w/api.php',
- 'username' => $wmgZeroPortalApiUserName,
- 'password' => $wmgZeroPortalApiPassword,
- ];
- };
+ $wgJsonConfigs['JsonZeroConfig']['isLocal'] = false;
+ $wgJsonConfigs['JsonZeroConfig']['remote'] = [
+ 'url' => 'https://zero.wikimedia.org/w/api.php',
+ 'username' => $wmgZeroPortalApiUserName,
+ 'password' => $wmgZeroPortalApiPassword,
+ ];
// @TODO: which group(s) on all wikies should Zero allow to
flush cache?
$wgGroupPermissions['sysop']['jsonconfig-flush'] = true;
--
To view, visit https://gerrit.wikimedia.org/r/315854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I833693f4995316ab032da6da444ec3af53b34269
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
