Yurik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/316521

Change subject: Added array_replace_recursive merge strategy
......................................................................

Added array_replace_recursive merge strategy

For extension registry, add array_replace_recursive merge strategy,
as some extensions/configuration may prefer that to array_merge_recursive.

Change-Id: Ica6ddd0ae76f23e60de9b6235c6e2a3f2754a95d
---
M includes/registration/ExtensionRegistry.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/21/316521/1

diff --git a/includes/registration/ExtensionRegistry.php 
b/includes/registration/ExtensionRegistry.php
index 35044e1..913d747 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -259,6 +259,9 @@
                                case 'array_merge_recursive':
                                        $GLOBALS[$key] = array_merge_recursive( 
$GLOBALS[$key], $val );
                                        break;
+                               case 'array_replace_recursive':
+                                       $GLOBALS[$key] = 
array_replace_recursive( $GLOBALS[$key], $val );
+                                       break;
                                case 'array_plus_2d':
                                        $GLOBALS[$key] = wfArrayPlus2d( 
$GLOBALS[$key], $val );
                                        break;

-- 
To view, visit https://gerrit.wikimedia.org/r/316521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica6ddd0ae76f23e60de9b6235c6e2a3f2754a95d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to