jenkins-bot has submitted this change and it was merged.
Change subject: Switch from SpecialCite to CiteThisPage on all wikis
......................................................................
Switch from SpecialCite to CiteThisPage on all wikis
Bug: 71112
Change-Id: I5f5c8d4c063fc35abd59444777194e092d29848a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings-labs.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
M wmf-config/extension-list-labs
5 files changed, 2 insertions(+), 11 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9c29b1f..320a824 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -588,10 +588,6 @@
require( $IP . '/extensions/Cite/Cite.php' );
}
-if ( $wmgUseCite && !$wmgUseCiteThisPage ) {
- require( $IP . '/extensions/Cite/SpecialCite.php' );
-}
-
if ( $wmgUseCiteThisPage ) {
require( $IP . '/extensions/CiteThisPage/CiteThisPage.php' );
}
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 366a528..1c8cc6c 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -378,10 +378,6 @@
'zhwiki' => true,
),
- 'wmgUseCiteThisPage' => array(
- 'default' => true,
- ),
-
'wmgUseFlow' => array(
'enwiki' => true,
'en_rtlwiki' => true,
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 1d5e681..2940ef1 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14046,7 +14046,7 @@
),
'wmgUseCiteThisPage' => array(
- 'default' => false,
+ 'default' => true,
'loginwiki' => false,
'votewiki' => false,
),
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 741619a..c52c636 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -14,7 +14,7 @@
$IP/extensions/CheckUser/CheckUser.php
$IP/extensions/CirrusSearch/CirrusSearch.php
$IP/extensions/Cite/Cite.php
-$IP/extensions/Cite/SpecialCite.php
+$IP/extensions/CiteThisPage/CiteThisPage.php
$IP/extensions/cldr/cldr.php
$IP/extensions/CleanChanges/CleanChanges.php
$IP/extensions/CodeEditor/CodeEditor.php
diff --git a/wmf-config/extension-list-labs b/wmf-config/extension-list-labs
index e9308ae..e5896df 100644
--- a/wmf-config/extension-list-labs
+++ b/wmf-config/extension-list-labs
@@ -1,5 +1,4 @@
$IP/extensions/BounceHandler/BounceHandler.php
-$IP/extensions/CiteThisPage/CiteThisPage.php
$IP/extensions/ContentTranslation/ContentTranslation.php
$IP/extensions/FundraisingTranslateWorkflow/FundraisingTranslateWorkflow.php
$IP/extensions/GlobalCssJs/GlobalCssJs.php
--
To view, visit https://gerrit.wikimedia.org/r/158121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f5c8d4c063fc35abd59444777194e092d29848a
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Greg Grossmeier <g...@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
