jenkins-bot has submitted this change and it was merged.
Change subject: Fix fatal error when usebetatoolbar option was activated and
not showtoolbar
......................................................................
Fix fatal error when usebetatoolbar option was activated and not showtoolbar
Users in this configuration will still have a degraded but working editing
experience
Bug: 61220
Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
---
M modules/page/ext.proofreadpage.page.edit.js
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Phe: Looks good to me, but someone else must approve
Tpt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/page/ext.proofreadpage.page.edit.js
b/modules/page/ext.proofreadpage.page.edit.js
index 969c852..28c428e 100644
--- a/modules/page/ext.proofreadpage.page.edit.js
+++ b/modules/page/ext.proofreadpage.page.edit.js
@@ -185,7 +185,7 @@
}
} );
} );
- } else {
+ } else if( mw.user.options.get( 'showtoolbar' ) ) {
mw.loader.using( 'mediawiki.action.edit', function() {
var $toolbar = $( '#toolbar' );
@@ -212,7 +212,7 @@
* Improve the WikiEditor interface
*/
function setupWikiEditor() {
- if( !mw.user.options.get( 'usebetatoolbar' ) ) {
+ if( !mw.user.options.get( 'showtoolbar' ) ||
!mw.user.options.get( 'usebetatoolbar' ) ) {
return;
}
mw.loader.using( 'ext.wikiEditor', function() {
--
To view, visit https://gerrit.wikimedia.org/r/115205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9d638f29dcd8fb9c56c04b08e4ed27fb5f31f43
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt <[email protected]>
Gerrit-Reviewer: Phe <[email protected]>
Gerrit-Reviewer: Rtdwivedi <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
