bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix module loading on MediaWiki 1.31 and earlier

Browse Source 
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
This commit is contained in:
Fomafix
2018-09-03 10:28:47 +02:00
committed by jenkins-bot
parent 0fbdbc2c41
commit 931982d728
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
UniversalLanguageSelector.hooks.php
View File

@@ -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';

24
extension.json
View File

@@ -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": [