TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/106685
Change subject: [Do not merge] CodeEditor should not load WikiEditor if disabled
......................................................................
[Do not merge] CodeEditor should not load WikiEditor if disabled
People find it annoying that the CodeEditor depends on WikiEditor and
bypasses the usebetatoolbar preference.
Bug: 55419
Change-Id: If3ac94687fef6ac3adbd594dbf4fd18194425b36
---
M CodeEditor.hooks.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CodeEditor
refs/changes/85/106685/1
diff --git a/CodeEditor.hooks.php b/CodeEditor.hooks.php
index 1e0cd30..738b0c9 100644
--- a/CodeEditor.hooks.php
+++ b/CodeEditor.hooks.php
@@ -20,9 +20,10 @@
}
public static function editPageShowEditFormInitial( &$toolbar ) {
- global $wgOut, $wgTitle;
+ global $wgOut, $wgTitle, $wgUser;
$lang = self::getPageLanguage( $wgTitle );
- if ( $lang ) {
+ $showToolbar = $wgUser->getOption( 'usebetatoolbar' );
+ if ( $lang && $showToolbar ) {
$wgOut->addModules( 'ext.codeEditor' );
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/106685
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3ac94687fef6ac3adbd594dbf4fd18194425b36
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeEditor
Gerrit-Branch: master
Gerrit-Owner: TheDJ <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
