jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395529 )
Change subject: Don't break codemirror if wikEdDiff is enabled, only if wikEd
is enabled
......................................................................
Don't break codemirror if wikEdDiff is enabled, only if wikEd is enabled
Bug: T178348
Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
---
M resources/ext.CodeMirror.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Kaldari: Looks good to me, approved
diff --git a/resources/ext.CodeMirror.js b/resources/ext.CodeMirror.js
index c0770e0..03a84f0 100644
--- a/resources/ext.CodeMirror.js
+++ b/resources/ext.CodeMirror.js
@@ -302,7 +302,7 @@
// If CodeMirror is already loaded or wikEd gadget is
enabled, abort. See T178348.
// FIXME: Would be good to replace the wikEd check with
something more generic.
- if ( codeMirror || window.wikEd !== undefined ) {
+ if ( codeMirror || mw.user.options.get( 'gadget-wikEd'
) > 0 ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/395529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If579d4da99f364e73dec5a7e6bed87019431386b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CodeMirror
Gerrit-Branch: master
Gerrit-Owner: Niharika29 <nko...@wikimedia.org>
Gerrit-Reviewer: Fomafix <foma...@googlemail.com>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
