Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/259291
Change subject: Re enable extension registration
......................................................................
Re enable extension registration
This sorts out the global config issue.
Change-Id: I965c8055718ace90ca1797aa41a9dc79892d12b3
---
M Cargo.php
M extension.json
2 files changed, 22 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/91/259291/1
diff --git a/Cargo.php b/Cargo.php
index 57a21c6..6ea9c24 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -21,11 +21,12 @@
// variables in extension.json needs to be fixed.
//if ( version_compare( $wgVersion, '1.25.3', '>=' ) ) {
-if ( false ) {
+if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'Cargo' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
$wgMessagesDirs['Cargo'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['CargoMagic'] = __DIR__ .
'/Cargo.i18n.magic.php';
+ $wgExtensionMessagesFiles['CargoAlias'] = __DIR__ . '/Cargo.alias.php';
/* wfWarn(
'Deprecated PHP entry point used for Cargo extension. Please
use wfLoadExtension instead, ' .
'see https://www.mediawiki.org/wiki/Extension_registration for
more details.'
diff --git a/extension.json b/extension.json
index 7eddd3b..e498dd1 100644
--- a/extension.json
+++ b/extension.json
@@ -33,7 +33,8 @@
]
},
"ExtensionMessagesFiles": {
- "CargoMagic": "Cargo.i18n.magic.php"
+ "CargoMagic": "Cargo.i18n.magic.php",
+ "CargoAlias": "Cargo.alias.php"
},
"AutoloadClasses": {
"CargoHooks": "Cargo.hooks.php",
@@ -257,23 +258,24 @@
]
},
"config": {
- "CargoDecimalMark": ".",
- "CargoDigitGroupingCharacter": ",",
- "CargoRecurringEventMaxInstances": 100,
- "CargoDBtype": null,
- "CargoDBserver": null,
- "CargoDBname": null,
- "CargoDBuser": null,
- "CargoDBpassword": null,
- "CargoDefaultQueryLimit": 100,
- "CargoMaxQueryLimit": 5000,
- "Cargo24HourTime": false,
- "CargoMapClusteringMinimum": 80,
- "CargoDrilldownUseTabs": false,
- "CargoDrilldownSmallestFontSize": -1,
- "CargoDrilldownLargestFontSize": -1,
- "CargoDrilldownMinValuesForComboBox": 40,
- "CargoDrilldownNumRangesForNumbers": 5
+ "_prefix": "",
+ "wgCargoDecimalMark": ".",
+ "wgCargoDigitGroupingCharacter": ",",
+ "wgCargoRecurringEventMaxInstances": 100,
+ "wgCargoDBtype": null,
+ "wgCargoDBserver": null,
+ "wgCargoDBname": null,
+ "wgCargoDBuser": null,
+ "wgCargoDBpassword": null,
+ "wgCargoDefaultQueryLimit": 100,
+ "wgCargoMaxQueryLimit": 5000,
+ "wgCargo24HourTime": false,
+ "wgCargoMapClusteringMinimum": 80,
+ "wgCargoDrilldownUseTabs": false,
+ "wgCargoDrilldownSmallestFontSize": -1,
+ "wgCargoDrilldownLargestFontSize": -1,
+ "wgCargoDrilldownMinValuesForComboBox": 40,
+ "wgCargoDrilldownNumRangesForNumbers": 5
},
"manifest_version": 1
}
--
To view, visit https://gerrit.wikimedia.org/r/259291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I965c8055718ace90ca1797aa41a9dc79892d12b3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
