jenkins-bot has submitted this change and it was merged.
Change subject: array_merge -> array_merge_recursive
......................................................................
array_merge -> array_merge_recursive
Change-Id: I79ced9742d5c1970549291e4cbb23f69309bd1fd
---
M includes/JCApi.php
M includes/JCSingleton.php
2 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/JCApi.php b/includes/JCApi.php
index 2a6f58d..98e6e77 100644
--- a/includes/JCApi.php
+++ b/includes/JCApi.php
@@ -54,7 +54,7 @@
$result->addValue(
null,
'models',
- array_merge(
+ array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute( 'JsonConfigModels' ),
$wgJsonConfigModels
)
diff --git a/includes/JCSingleton.php b/includes/JCSingleton.php
index 62130f7..ae7c142 100644
--- a/includes/JCSingleton.php
+++ b/includes/JCSingleton.php
@@ -69,11 +69,11 @@
list( self::$titleMap, self::$namespaces ) =
self::parseConfiguration(
$wgNamespaceContentModels,
$wgContentHandlers,
- array_merge(
+ array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute( 'JsonConfigs' ),
$wgJsonConfigs
),
- array_merge(
+ array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute( 'JsonConfigModels' ),
$wgJsonConfigModels
)
@@ -390,7 +390,7 @@
public static function getContentClass( $modelId ) {
global $wgJsonConfigModels;
- $configModels = array_merge(
+ $configModels = array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute(
'JsonConfigModels' ),
$wgJsonConfigModels
);
@@ -591,7 +591,7 @@
}
self::init();
- $models = array_merge(
+ $models = array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute(
'JsonConfigModels' ),
$wgJsonConfigModels
);
@@ -799,7 +799,7 @@
if ( $isStorage === null ) {
global $wgJsonConfigs;
$isStorage = false;
- $configs = array_merge(
+ $configs = array_merge_recursive(
\ExtensionRegistry::getInstance()->getAttribute( 'JsonConfigs' ),
$wgJsonConfigs
);
--
To view, visit https://gerrit.wikimedia.org/r/315848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79ced9742d5c1970549291e4cbb23f69309bd1fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/JsonConfig
Gerrit-Branch: wmf/1.28.0-wmf.22
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
