From 5fab7bd738034f6944c194c940c254871c95b4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thiemo=20M=C3=A4ttig?= Date: Sat, 22 Mar 2014 16:40:06 +0100 Subject: [PATCH] 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 --- resources/js/ext.uls.ime.js | 2 +- resources/js/ext.uls.init.js | 2 +- resources/js/ext.uls.mediawiki.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/js/ext.uls.ime.js b/resources/js/ext.uls.ime.js index 334893c2..e80ff0d4 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 1318c5af..2dbe1d0a 100644 --- a/resources/js/ext.uls.init.js +++ b/resources/js/ext.uls.init.js @@ -140,7 +140,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 3e32e837..3bc0eeaa 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' } );