jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/401728 )
Change subject: Fix detection of WikiEditor and toolbar
......................................................................
Fix detection of WikiEditor and toolbar
See changes done in I7677f0b597c33f236192aea1aaa347a36216fbb7
Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Depends-On: I7677f0b597c33f236192aea1aaa347a36216fbb7
---
M includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
index 2f902c5..560eacd 100644
--- a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
@@ -555,7 +555,8 @@
}
private function wikiEditorIsEnabled() {
- return class_exists( WikiEditorHooks::class ) &&
WikiEditorHooks::isEnabled( 'toolbar' );
+ return ExtensionRegistry::getInstance()->isLoaded( 'WikiEditor'
) &&
+ $this->out->getUser()->getOption( 'usebetatoolbar' );
}
private function deactivateWikEd() {
--
To view, visit https://gerrit.wikimedia.org/r/401728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
