jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334176 )
Change subject: Don't set Flow preferences in hooks
......................................................................
Don't set Flow preferences in hooks
Flow preference default values are set in extension.json
and potentially redefined by config files. Setting them
in FlowHooks::initFlowExtension overwrites everything else.
Bug: T155665
Change-Id: I79771b9624fa19c794666d6bb504af1930aa1d00
---
M Hooks.php
1 file changed, 1 insertion(+), 15 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index db3cf3a..468f756 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -154,21 +154,7 @@
* from $wgExtensionFunctions
*/
public static function initFlowExtension() {
- global $wgDefaultUserOptions, $wgFlowContentFormat;
-
- // Echo notification subscription preference
- $wgDefaultUserOptions['echo-subscriptions-web-flow-discussion']
= true;
-
$wgDefaultUserOptions['echo-subscriptions-email-flow-discussion'] = false;
-
- // Default sort order of a topiclist view. See
TopicListBlock::getFindOptions()
- // for more information.
- $wgDefaultUserOptions['flow-topiclist-sortby'] = 'updated';
-
- // Default editor to use in Flow
- $wgDefaultUserOptions['flow-editor'] = 'wikitext';
-
- // Default state of the side rail
- $wgDefaultUserOptions['flow-side-rail-state'] = 'expanded';
+ global $wgFlowContentFormat;
// needed to determine if a page is occupied by flow
self::getOccupationController();
--
To view, visit https://gerrit.wikimedia.org/r/334176
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79771b9624fa19c794666d6bb504af1930aa1d00
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Sbisson <sbis...@wikimedia.org>
Gerrit-Reviewer: Mattflaschen <mflasc...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
