Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/120212
Change subject: Make sure script execution doesn't stop by assuming unchecked
input is set
......................................................................
Make sure script execution doesn't stop by assuming unchecked input is set
These methods aren't designed to return "undefined" or "null".
What they return is not checked. It's assumed to always be an
object (2 of them) or an array (1 of them). This simple patch
does make sure the following code does not fail with TypeErrors.
Bug: 55701
Change-Id: I19f51bbff2209044485b9d7cef4c7654cb5f6425
---
M resources/js/ext.uls.ime.js
M resources/js/ext.uls.init.js
M resources/js/ext.uls.mediawiki.js
3 files changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector
refs/changes/12/120212/1
diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js
index c379101..b764c5f 100644
--- a/resources/js/ext.uls.ime.js
+++ b/resources/js/ext.uls.ime.js
@@ -31,7 +31,7 @@
mw.ime.getLanguagesWithIME = function () {
var language,
- ulsLanguages = mw.config.get( 'wgULSLanguages' ),
+ ulsLanguages = mw.config.get( 'wgULSLanguages' ) || {},
availableLanguages = {};
for ( language in $.ime.languages ) {
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index a4a8d83..6520aef 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -146,7 +146,7 @@
};
mw.uls.getAcceptLanguageList = function () {
- return mw.config.get( 'wgULSAcceptLanguageList' );
+ return mw.config.get( 'wgULSAcceptLanguageList' ) || [];
};
/**
diff --git a/resources/js/ext.uls.mediawiki.js
b/resources/js/ext.uls.mediawiki.js
index 3e32e83..3bc0eea 100644
--- a/resources/js/ext.uls.mediawiki.js
+++ b/resources/js/ext.uls.mediawiki.js
@@ -21,7 +21,7 @@
// MediaWiki overrides for ULS defaults
$.fn.uls.defaults = $.extend( $.fn.uls.defaults, {
- languages: mw.config.get( 'wgULSLanguages' ),
+ languages: mw.config.get( 'wgULSLanguages' ) || {},
searchAPI: mw.util.wikiScript( 'api' ) +
'?action=languagesearch'
} );
--
To view, visit https://gerrit.wikimedia.org/r/120212
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I19f51bbff2209044485b9d7cef4c7654cb5f6425
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
