Alex Monk has submitted this change and it was merged.
Change subject: (bug 44682) adding new license needs array_merge_recursive.
......................................................................
(bug 44682) adding new license needs array_merge_recursive.
Change-Id: I37bfe40c1f36d149ea9cd7f14d7d56d9ea8e10cc
---
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 74bd18d..ad158a5 100644
--- a/includes/UploadWizardConfig.php
+++ b/includes/UploadWizardConfig.php
@@ -37,7 +37,7 @@
static $mergedConfig = false;
if ( !$mergedConfig ) {
- $wgUploadWizardConfig = array_merge(
self::getDefaultConfig(), $wgUploadWizardConfig );
+ $wgUploadWizardConfig = array_merge_recursive(
self::getDefaultConfig(), $wgUploadWizardConfig );
$mergedConfig = true;
}
--
To view, visit https://gerrit.wikimedia.org/r/49849
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I37bfe40c1f36d149ea9cd7f14d7d56d9ea8e10cc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Nischayn22 <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
