From 931982d72869c83f2c5b13da0cd4ff7bbaee6d5d Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Mon, 3 Sep 2018 10:28:47 +0200
Subject: [PATCH] Fix module loading on MediaWiki 1.31 and earlier

368fe37a1a is broken when used on MediaWiki 1.31 and earlier because
it tries to add

  $modules['ext.uls.displaysettings']['dependencies'][]

although $modules['ext.uls.displaysettings'] does not exist.

The whole module definition must moved from extension.json to
UniversalLanguageSelector.hooks.php.

Change-Id: Ie8f7f084c965e6dee33fef03448004d5d8805f2c
---
 UniversalLanguageSelector.hooks.php | 24 ++++++++++++++++++++++++
 extension.json                      | 24 ------------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/UniversalLanguageSelector.hooks.php b/UniversalLanguageSelector.hooks.php
index d2ef7813..4884f98b 100644
--- a/UniversalLanguageSelector.hooks.php
+++ b/UniversalLanguageSelector.hooks.php
@@ -482,6 +482,30 @@ class UniversalLanguageSelectorHooks {
 			'localBasePath' => __DIR__ . '/resources',
 			'remoteExtPath' => 'UniversalLanguageSelector/resources'
 		];
+		$modules['ext.uls.displaysettings'] = [
+			'scripts' => 'js/ext.uls.displaysettings.js',
+			'styles' => 'css/ext.uls.displaysettings.less',
+			'dependencies' => [
+				'ext.uls.languagesettings',
+				'ext.uls.mediawiki',
+				'ext.uls.webfonts',
+				'mediawiki.api',
+				'mediawiki.ui.checkbox',
+				'mediawiki.ui.button',
+				'mediawiki.user'
+			],
+			'localBasePath' => __DIR__ . '/resources',
+			'remoteExtPath' => 'UniversalLanguageSelector/resources'
+		];
+		$modules['ext.uls.preferences'] = [
+			'scripts' => 'js/ext.uls.preferences.js',
+			'dependencies' => [
+				'mediawiki.user',
+				'mediawiki.api'
+			],
+			'localBasePath' => __DIR__ . '/resources',
+			'remoteExtPath' => 'UniversalLanguageSelector/resources'
+		];
 		if ( version_compare( $wgVersion, '1.32', '<' ) ) {
 			// Support: MediaWiki 1.31 and earlier (T200168)
 			$modules['ext.uls.displaysettings']['dependencies'][] = 'mediawiki.api.parse';
diff --git a/extension.json b/extension.json
index 6335e2a1..34e7ae77 100644
--- a/extension.json
+++ b/extension.json
@@ -116,21 +116,6 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
-		"ext.uls.displaysettings": {
-			"scripts": "js/ext.uls.displaysettings.js",
-			"styles": "css/ext.uls.displaysettings.less",
-			"dependencies": [
-				"ext.uls.languagesettings",
-				"ext.uls.mediawiki",
-				"ext.uls.webfonts",
-				"mediawiki.api",
-				"mediawiki.ui.checkbox",
-				"mediawiki.ui.button",
-				"mediawiki.user"
-			],
-			"localBasePath": "resources",
-			"remoteExtPath": "UniversalLanguageSelector/resources"
-		},
 		"ext.uls.geoclient": {
 			"scripts": "js/ext.uls.geoclient.js",
 			"dependencies": [
@@ -233,15 +218,6 @@
 			"localBasePath": "resources",
 			"remoteExtPath": "UniversalLanguageSelector/resources"
 		},
-		"ext.uls.preferences": {
-			"scripts": "js/ext.uls.preferences.js",
-			"dependencies": [
-				"mediawiki.user",
-				"mediawiki.api"
-			],
-			"localBasePath": "resources",
-			"remoteExtPath": "UniversalLanguageSelector/resources"
-		},
 		"ext.uls.webfonts": {
 			"scripts": "js/ext.uls.webfonts.js",
 			"dependencies": [