jenkins-bot has submitted this change and it was merged. Change subject: Disable a bunch of extensions on loginwiki/votewiki ......................................................................
Disable a bunch of extensions on loginwiki/votewiki Bug: T61702 Change-Id: Ia2b06b063cdb5051c0e47b44b3d87e9c449b9b44 --- M wmf-config/CommonSettings.php M wmf-config/InitialiseSettings.php 2 files changed, 45 insertions(+), 8 deletions(-) Approvals: Alex Monk: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php index e5b36ec..39ae8cd 100755 --- a/wmf-config/CommonSettings.php +++ b/wmf-config/CommonSettings.php @@ -352,7 +352,9 @@ $wgFileBlacklist[] = 'txt'; $wgFileBlacklist[] = 'mht'; -include( $IP . '/extensions/PagedTiffHandler/PagedTiffHandler.php' ); +if ( $wmgUsePagedTiffHandler ) { + include( $IP . '/extensions/PagedTiffHandler/PagedTiffHandler.php' ); +} $wgTiffUseTiffinfo = true; $wgTiffMaxMetaSize = 1048576; @@ -528,9 +530,13 @@ $wgSiteMatrixPrivateSites = MWWikiversions::readDbListFile( getRealmSpecificFilename( "$IP/../private.dblist" ) ); $wgSiteMatrixFishbowlSites = MWWikiversions::readDbListFile( getRealmSpecificFilename( "$IP/../fishbowl.dblist" ) ); -ExtensionRegistry::getInstance()->queue( "$IP/extensions/CharInsert/extension.json" ); +if ( $wmgUseCharInsert ) { + ExtensionRegistry::getInstance()->queue( "$IP/extensions/CharInsert/extension.json" ); +} -include( $IP . '/extensions/ParserFunctions/ParserFunctions.php' ); +if ( $wmgUseParserFunctions ) { + include( $IP . '/extensions/ParserFunctions/ParserFunctions.php' ); +} $wgExpensiveParserFunctionLimit = 500; if ( $wmgUseCite ) { @@ -2055,10 +2061,12 @@ $wgCitoidServiceUrl = '//citoid.wikimedia.org/api'; } -// TemplateData enabled for all wikis - 2014-09-29 -require_once( "$IP/extensions/TemplateData/TemplateData.php" ); -// TemplateData GUI enabled for all wikis - 2014-11-06 -$wgTemplateDataUseGUI = true; +if ( $wmgUseTemplateData ) { // T61702 - 2015-07-20 + // TemplateData enabled for all wikis - 2014-09-29 + require_once( "$IP/extensions/TemplateData/TemplateData.php" ); + // TemplateData GUI enabled for all wikis - 2014-11-06 + $wgTemplateDataUseGUI = true; +} if ( $wmgUseGoogleNewsSitemap ) { include( "$IP/extensions/GoogleNewsSitemap/GoogleNewsSitemap.php" ); diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 5624afc..8648c7d 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -4181,11 +4181,13 @@ 'default' => true, 'advisorywiki' => false, // Per T27519 'fishbowl' => false, // Per T19718 Disable CentralNotice on private/fishbowl wikis + 'loginwiki' => false, // T61702 'nonglobal' => false, 'fiwikimedia' => false, // T19718 'private' => false, // :D 'qualitywiki' => false, 'ukwikimedia' => false, // T19718 Disable CentralNotice on private/fishbowl wikis + 'votewiki' => false, // T61702 ), 'wmgCentralNoticeLoader' => array( @@ -12532,6 +12534,8 @@ 'wmgUseParsoid' => array( 'default' => true, + 'loginwiki' => false, // T61702 + 'votewiki' => false, // T61702 ), // Should a users' Cookie: headers be forwarded to Parsoid (for private wikis) @@ -12882,8 +12886,9 @@ 'wmgUseMath' => array( 'default' => true, // moved from MW core - 'loginwiki' => false, 'labswiki' => false, + 'loginwiki' => false, + 'votewiki' => false, // T61702 ), 'wmgUseMoodBar' => array( @@ -14519,6 +14524,8 @@ ), 'wmgUseDisambiguator' => array( 'default' => true, + 'loginwiki' => false, // T61702 + 'votewiki' => false, // T61702 ), 'wmgUseCodeEditorForCore' => array( @@ -14715,6 +14722,8 @@ 'wmgUseUniversalLanguageSelector' => array( 'default' => true, + 'loginwiki' => false, // T61702 + 'votewiki' => false, // T61702 ), 'wmgULSPosition' => array( @@ -15224,6 +15233,26 @@ 'kowikiversity' => true, ), +'wmgUsePagedTiffHandler' => array( + 'default' => true, + 'loginwiki' => false, // T61702 + 'votewiki' => false, // T61702 +), + +'wmgUseParserFunctions' => array( + 'default' => true, + 'loginwiki' => false, // T61702 +), + +'wmgUseTemplateData' => array( + 'default' => true, + 'loginwiki' => false, // T61702 + 'votewiki' => false, // T61702 +), +'wmgUseCharInsert' => array( + 'default' => true, + 'loginwiki' => false, // T61702 +), ### End (roughly) of general extensions ######################## // Apply blocks to IPs in XFF (T25343) -- To view, visit https://gerrit.wikimedia.org/r/225840 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia2b06b063cdb5051c0e47b44b3d87e9c449b9b44 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Alex Monk <kren...@gmail.com> Gerrit-Reviewer: Anomie <bjor...@wikimedia.org> Gerrit-Reviewer: CSteipp <cste...@wikimedia.org> Gerrit-Reviewer: Glaisher <glaisher.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits