Merge changes I83625c21,I93b3329d

* changes:
  Remove empty @returns comment
  Fix possible variable pollution

data/LanguageNameIndexer.php

@@ -39,8 +39,8 @@ class LanguageNameIndexer extends Maintenance {
 		foreach ( $languages as $code => $name ) {
 			$all[$code][strtolower( $name )] = true;
 			$langnames = LanguageNames::getNames( $code, 0, 2 );
-			foreach ( $langnames as $code => $name ) { // FIXME: Variable pollution
-				$all[$code][] = strtolower( $name );
+			foreach ( $langnames as $langCode => $langName ) {
+				$all[$langCode][] = strtolower( $langName );
 			}
 		}
 

resources/js/ext.uls.preferences.js

@@ -57,7 +57,6 @@
 		 * Get a preference value for the given preference name
 		 *
 		 * @param key
-		 * @returns
 		 */
 		get: function ( key ) {
 			return this.preferences[key];