Alex Monk has submitted this change and it was merged.
Change subject: Revert "(bug 44682) adding new license needs
array_merge_recursive."
......................................................................
Revert "(bug 44682) adding new license needs array_merge_recursive."
This reverts commit be41e57c4cb5e0fcd13dd89b61afb8bbd863943d
Completely broke $wgUploadWizardConfig and associated settings by messing up
the config array.
Change-Id: Iebaf01a92b73890fe78341c08c8f711de25eb5c6
---
M includes/UploadWizardConfig.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alex Monk: Verified; Looks good to me, approved
diff --git a/includes/UploadWizardConfig.php b/includes/UploadWizardConfig.php
index ad158a5..74bd18d 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -37,7 +37,7 @@
static $mergedConfig = false;
if ( !$mergedConfig ) {
- $wgUploadWizardConfig = array_merge_recursive(
self::getDefaultConfig(), $wgUploadWizardConfig );
+ $wgUploadWizardConfig = array_merge(
self::getDefaultConfig(), $wgUploadWizardConfig );
$mergedConfig = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/53137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iebaf01a92b73890fe78341c08c8f711de25eb5c6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Eloquence <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
