jenkins-bot has submitted this change and it was merged.
Change subject: Fix extension.json and also re add support for extension.json
in MW 1.27
......................................................................
Fix extension.json and also re add support for extension.json in MW 1.27
Change-Id: Ia58769f92153cd08409bc5c850b7ac0623b98b02
---
M PageForms.php
M extension.json
2 files changed, 38 insertions(+), 88 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PageForms.php b/PageForms.php
index 65372f4..8efef74 100644
--- a/PageForms.php
+++ b/PageForms.php
@@ -43,7 +43,7 @@
// set in LocalSettings.php do not override the settings in
// extension.json. For simplicity's sake, don't load extensions unless we're
// at version 1.27 or higher.
-if ( version_compare( $GLOBALS['wgVersion'], '1.28c', '>' ) ) {
+if ( version_compare( $GLOBALS['wgVersion'], '1.27c', '>' ) ) {
if ( function_exists( 'wfLoadExtension' ) ) {
wfLoadExtension( 'PageForms' );
// Keep i18n globals so mergeMessageFileList.php doesn't break
diff --git a/extension.json b/extension.json
index eb57cb4..90461f4 100644
--- a/extension.json
+++ b/extension.json
@@ -31,7 +31,7 @@
"PFHooks::initialize"
],
"require": {
- "MediaWiki": ">= 1.28.0"
+ "MediaWiki": ">= 1.27.0"
},
"GroupPermissions": {
"*": {
@@ -397,93 +397,43 @@
]
},
"config": {
- "PageFormsMaxAutocompleteValues": {
- "value": 1000
- },
- "PageFormsMaxLocalAutocompleteValues": {
- "value": 100
- },
- "PageFormsAutocompleteOnAllChars": {
- "value": false
- },
- "PageFormsCacheAutocompleteValues": {
- "value": false
- },
- "PageFormsAutocompleteCacheTimeout": {
- "value": null
- },
- "PageFormsRenameEditTabs": {
- "value": false
- },
- "PageFormsRenameMainEditTab": {
- "value": false
- },
- "PageFormsListSeparator": {
- "value": ","
- },
- "PageForms24HourTime": {
- "value": false
- },
- "PageFormsCacheFormDefinitions": {
- "value": false
- },
- "PageFormsFormCacheType": {
- "value": null
- },
- "PageFormsLinkAllRedLinksToForms": {
- "value": false
- },
- "PageFormsRedLinksCheckOnlyLocalProps": {
- "value": false
- },
- "PageFormsShowTabsForAllHelperForms": {
- "value": true
- },
- "PageFormsRunQueryFormAtTop": {
- "value": false
- },
- "PageFormsGoogleMapsKey": {
- "value": null
- },
- "PageFormsShowOnSelect": {
- "value": []
- },
- "PageFormsAutocompleteValues": {
- "value": []
- },
- "PageFormsGridValues": {
- "value": []
- },
- "PageFormsGridParams": {
- "value": []
- },
- "PageFormsFieldProperties": {
- "value": []
- },
- "PageFormsCargoFields": {
- "value": []
- },
- "PageFormsDependentFields": {
- "value": []
- },
- "PageFormsCheckboxesSelectAllMinimum": {
- "value": 10
- },
+ "PageFormsMaxAutocompleteValues": 1000,
+ "PageFormsMaxLocalAutocompleteValues": 100,
+ "PageFormsAutocompleteOnAllChars": false,
+ "PageFormsCacheAutocompleteValues": false,
+ "PageFormsAutocompleteCacheTimeout": null,
+ "PageFormsRenameEditTabs": false,
+ "PageFormsRenameMainEditTab": false,
+ "PageFormsListSeparator": ",",
+ "PageForms24HourTime": false,
+ "PageFormsCacheFormDefinitions": false,
+ "PageFormsFormCacheType": null,
+ "PageFormsLinkAllRedLinksToForms": false,
+ "PageFormsRedLinksCheckOnlyLocalProps": false,
+ "PageFormsShowTabsForAllHelperForms": true,
+ "PageFormsRunQueryFormAtTop": false,
+ "PageFormsGoogleMapsKey": null,
+ "PageFormsShowOnSelect": [],
+ "PageFormsAutocompleteValues": [],
+ "PageFormsGridValues": [],
+ "PageFormsGridParams": [],
+ "PageFormsFieldProperties": [],
+ "PageFormsCargoFields": [],
+ "PageFormsDependentFields": [],
+ "PageFormsCheckboxesSelectAllMinimum": 10,
"PageFormsDatePickerSettings": {
- "value": {
- "@note": "See PF_DefaultInputSettings.php for
allowed values",
- "FirstDate": null,
- "LastDate": null,
- "DateFormat": "SHORT",
- "WeekStart": null,
- "ShowWeekNumbers": false,
- "DisableInputField": false,
- "ShowResetButton": false,
- "DisabledDaysOfWeek": null,
- "HighlightedDaysOfWeek": null,
- "DisabledDates": null,
- "HighlightedDates": null
- },
+ "@note": "See PF_DefaultInputSettings.php for allowed
values",
+ "FirstDate": null,
+ "LastDate": null,
+ "DateFormat": "SHORT",
+ "WeekStart": null,
+ "ShowWeekNumbers": false,
+ "DisableInputField": false,
+ "ShowResetButton": false,
+ "DisabledDaysOfWeek": null,
+ "HighlightedDaysOfWeek": null,
+ "DisabledDates": null,
+ "HighlightedDates": null,
"merge_strategy": "array_plus"
}
},
--
To view, visit https://gerrit.wikimedia.org/r/319264
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia58769f92153cd08409bc5c850b7ac0623b98b02
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
