jenkins-bot has submitted this change and it was merged.
Change subject: Fixup CategoryTree config, disable where necessary
......................................................................
Fixup CategoryTree config, disable where necessary
Disable cite in a couple of places too
Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 28 insertions(+), 10 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 4380d4d..57e1f80 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -564,9 +564,10 @@
$wgMaxIfExistCount = 500; // obs
$wgExpensiveParserFunctionLimit = 500;
-// <ref> and <references> tags -ævar, 2005-12-23
-require( $IP . '/extensions/Cite/Cite.php' );
-require( $IP . '/extensions/Cite/SpecialCite.php' );
+if ( $wmgUseCite ) {
+ require( $IP . '/extensions/Cite/Cite.php' );
+ require( $IP . '/extensions/Cite/SpecialCite.php' );
+}
# Inputbox extension for searching or creating articles
include( $IP . '/extensions/InputBox/InputBox.php' );
@@ -599,10 +600,13 @@
// So enwiki's protection rights can be assigned to global groups
$wgAvailableRights[] = 'templateeditor';
-$wgUseAjax = true;
-$wgCategoryTreeDynamicTag = true;
-require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
-$wgCategoryTreeDisableCache = false;
+if ( $wmgUseCategoryTree ) {
+ require( $IP . '/extensions/CategoryTree/CategoryTree.php' );
+ $wgCategoryTreeDynamicTag = $wmgCategoryTreeDynamicTag;
+ $wgCategoryTreeCategoryPageMode = $wmgCategoryTreeCategoryPageMode;
+ $wgCategoryTreeCategoryPageOptions =
$wmgCategoryTreeCategoryPageOptions;
+ $wgCategoryTreeDisableCache = false;
+}
if ( $wmgUseProofreadPage ) {
include( $IP . '/extensions/ProofreadPage/ProofreadPage.php' );
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index cea2c3e..3b34ca9 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9269,19 +9269,26 @@
# below seems to be for extensions
# EXTENSIONS @{
-'wgCategoryTreeDynamicTag' => array(
+'wmgUseCategoryTree' => array(
+ 'default' => true,
+ 'loginwiki' => false,
+ 'votewiki' => false,
+),
+
+'wmgCategoryTreeDynamicTag' => array(
'default' => true,
),
// CT_MODE_CATEGORIES = 0
// CT_MODE_PAGES = 10
// CT_MODE_ALL = 20
-'wgCategoryTreeCategoryPageMode' => array(
+'wmgCategoryTreeCategoryPageMode' => array(
'default' => 0,
'hewiki' => 10,
),
-'wgCategoryTreeCategoryPageOptions' => array(
+'wmgCategoryTreeCategoryPageOptions' => array(
+ 'default' => array( 'mode' => null, 'showcount' => true ),
'hewiki' => array( 'mode' => 10 /*CT_MODE_PAGES*/ ), # bug 11776
),
@@ -12707,6 +12714,13 @@
'wikidatawiki' => array( 'content' => 7, 'general' => 1 ),
),
+'wmgUseCite' => array(
+ 'default' => true,
+ 'loginwiki' => false,
+ 'votewiki' => false,
+),
+
+
### End (roughly) of general extensions ########################
// Apply blocks to IPs in XFF (bug 23343)
--
To view, visit https://gerrit.wikimedia.org/r/105623
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdd8671a11440aeb6fc25f945732c512b614b86a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
