jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395984 )
Change subject: Fixed possible object when expected array in client config var
for mlmLanguages
......................................................................
Fixed possible object when expected array in client config var for mlmLanguages
Also added an id to the manager oojs window
Change-Id: I596aa48d914ad5cff3292ed090d3d3d60dde821a
---
M resources/ext.mlm.js
M src/Hooks/BeforePageDisplay.php
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.mlm.js b/resources/ext.mlm.js
index 7dca9fb..ef59c91 100644
--- a/resources/ext.mlm.js
+++ b/resources/ext.mlm.js
@@ -67,7 +67,7 @@
mw.mlm.dialog.prototype.initialize = function () {
mw.mlm.dialog.super.prototype.initialize.call( this );
- this.panel = new OO.ui.PanelLayout( { padded: true,
expanded: false } );
+ this.panel = new OO.ui.PanelLayout( { padded: true,
expanded: false, id: 'mlm-manager' } );
this.content = new OO.ui.FieldsetLayout();
this.errorSection = new OO.ui.Layout();
this.errorSection.$element.css( 'color', 'red' );
diff --git a/src/Hooks/BeforePageDisplay.php b/src/Hooks/BeforePageDisplay.php
index 1f78a04..e59f1c2 100644
--- a/src/Hooks/BeforePageDisplay.php
+++ b/src/Hooks/BeforePageDisplay.php
@@ -45,7 +45,7 @@
$availableLanguages = Helper::getAvailableLanguageCodes();
$this->oOutputPage->addJsConfigVars(
'mlmLanguages',
- $availableLanguages
+ array_values( $availableLanguages )
);
$sysLang = Helper::getSystemLanguageCode();
--
To view, visit https://gerrit.wikimedia.org/r/395984
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I596aa48d914ad5cff3292ed090d3d3d60dde821a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: master
Gerrit-Owner: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
