Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/263177
Change subject: Fix when no merge strategy is used
......................................................................
Fix when no merge strategy is used
When no merge strategy is used it wont merge the config if it is used in
localsettings.php causing the config extenison.json to work but not in
localsettings.php.
Change-Id: I69f2f2f87ce3e80181aebafe8eaa1a94a560b17a
---
M includes/registration/ExtensionRegistry.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/263177/1
diff --git a/includes/registration/ExtensionRegistry.php
b/includes/registration/ExtensionRegistry.php
index 86be86b..4b11c7e 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -266,7 +266,7 @@
$GLOBALS[$key] += $val;
break;
case 'array_merge':
- $GLOBALS[$key] = array_merge( $val,
$GLOBALS[$key] );
+ $GLOBALS[$key] = array_merge(
$GLOBALS[$key], $val );
break;
default:
throw new UnexpectedValueException(
"Unknown merge strategy '$mergeStrategy'" );
--
To view, visit https://gerrit.wikimedia.org/r/263177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69f2f2f87ce3e80181aebafe8eaa1a94a560b17a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
