jenkins-bot has submitted this change and it was merged.
Change subject: Enable Flow on all wikis, except private and a couple special
wikis
......................................................................
Enable Flow on all wikis, except private and a couple special wikis
This includes wikis without VisualEditor.
Private wikis are those that the public can't even read.
The "special" wikis are loginwiki and votewiki.
This does not actually put Flow on any pages, unless/until
someone explicitly enables it on particular page/namespace.
Also, add a sanity check that Parsoid is enabled.
Bug: T106562
Dependency: I3f01fa40fcb364382caddad268d1d90a4d37ad9a
Change-Id: I12af04743752469b7370fd9aabeed21a7ef7cc8c
---
D flow.dblist
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
3 files changed, 12 insertions(+), 26 deletions(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/flow.dblist b/flow.dblist
deleted file mode 100644
index c542ccf..0000000
--- a/flow.dblist
+++ /dev/null
@@ -1,17 +0,0 @@
-testwiki
-test2wiki
-mediawikiwiki
-metawiki
-enwiki
-frwiki
-hewiki
-officewiki
-ptwiki
-cawiki
-tewiki
-ruwiki
-pawiki
-zhwiki
-wikidatawiki
-viwiki
-plwiki
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 23e7dc3..e88e20d 100755
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -144,7 +144,7 @@
$wikiTags = array();
foreach ( array( 'private', 'fishbowl', 'special', 'closed',
'flaggedrevs', 'small', 'medium',
'large', 'wikimania', 'wikidata', 'wikidataclient',
'visualeditor-default',
- 'flow', 'commonsuploads', 'nonbetafeatures', 'group0',
'wikipedia',
+ 'commonsuploads', 'nonbetafeatures', 'group0',
'wikipedia',
'arbitraryaccess', 'usagetracking', 'nonglobal',
) as $tag ) {
$dblist = MWWikiversions::readDbListFile(
getRealmSpecificFilename( "$IP/../$tag.dblist" ) );
@@ -2481,7 +2481,7 @@
require_once( "$IP/extensions/Thanks/Thanks.php" );
}
-if ( $wmgUseFlow ) {
+if ( $wmgUseFlow && $wmgUseParsoid ) {
require_once( "$IP/extensions/Flow/Flow.php" );
// Flow Parsoid - These are now specified directly as Flow-specific
@@ -2494,8 +2494,10 @@
$wgFlowParsoidForwardCookies = true;
}
- $wgFlowEditorList = $wmgFlowEditorList;
- $wgDefaultUserOptions['flow-editor'] = 'visualeditor';
+ if ( $wmgUseVisualEditor ) {
+ $wgFlowEditorList = array( 'visualeditor', 'none' );
+ $wgDefaultUserOptions['flow-editor'] = 'visualeditor';
+ }
$wgFlowOccupyNamespaces = $wmgFlowOccupyNamespaces;
$wgFlowOccupyPages = $wmgFlowOccupyPages;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index d17a8a0..07a09d8 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -14474,11 +14474,12 @@
),
'wmgUseFlow' => array(
- 'default' => false,
- 'flow' => true,
-),
-'wmgFlowEditorList' => array(
- 'default' => array( 'visualeditor', 'none' ),
+ // Explicit wiki settings override tags
+ 'default' => true,
+ 'private' => false,
+ 'officewiki' => true,
+ 'loginwiki' => false,
+ 'votewiki' => false,
),
'wmgFlowOccupyNamespaces' => array(
'default' => array(),
--
To view, visit https://gerrit.wikimedia.org/r/226954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I12af04743752469b7370fd9aabeed21a7ef7cc8c
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: DannyH (WMF) <[email protected]>
Gerrit-Reviewer: EBernhardson <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Mattflaschen <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
