Reedy has submitted this change and it was merged.
Change subject: Revert "Reduce the amount of times the database lists are read
in"
......................................................................
Revert "Reduce the amount of times the database lists are read in"
String not array. Fail!
This reverts commit c639e985c44ac2905f80f75d4ad77f032950bf90
Change-Id: I58752383c5cc584e1858e4765b5de9a95cda1698
---
M wmf-config/CommonSettings.php
1 file changed, 6 insertions(+), 3 deletions(-)
Approvals:
Reedy: Verified; Looks good to me, approved
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b524dc9..cb56dbb 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1543,9 +1543,12 @@
$wgHooks['CentralAuthWikiList'][] = 'wmfCentralAuthWikiList';
function wmfCentralAuthWikiList( &$list ) {
- global $wgLocalDatabases, $IP, $wgSiteMatrixClosedSites,
$wgSiteMatrixPrivateSites, $wgSiteMatrixFishbowlSites;
+ global $wgLocalDatabases, $IP;
+ $privateWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../private.dblist" ) ) );
+ $fishbowlWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) ) );
+ $closedWikis = array_map( 'trim', file(
getRealmSpecificFilename( "$IP/../closed.dblist" ) ) );
$list = array_diff( $wgLocalDatabases,
- $wgSiteMatrixPrivateSites, $wgSiteMatrixFishbowlSites,
$wgSiteMatrixClosedSites );
+ $privateWikis, $fishbowlWikis, $closedWikis );
return true;
}
@@ -2240,7 +2243,7 @@
if ( $wmgUseIncubator ) {
require_once(
"$IP/extensions/WikimediaIncubator/WikimediaIncubator.php" );
- $wmincClosedWikis = $wgSiteMatrixClosedSites;
+ $wmincClosedWikis = getRealmSpecificFilename( "$IP/../closed.dblist" );
}
if ( $wmgUseWikiLove ) {
--
To view, visit https://gerrit.wikimedia.org/r/57167
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I58752383c5cc584e1858e4765b5de9a95cda1698
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
