EddieGP has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/374042 )
Change subject: ExtensionRegistry: Add 'override' merge strategy
......................................................................
ExtensionRegistry: Add 'override' merge strategy
That merge strategy just let's setting from LocalSettings.php override
anything that was specified in extension.json instead of merging arrays.
Bug: T142663
Change-Id: If6c7733c23c52bd77e291a1a436f0a81f37d71f3
---
M includes/registration/ExtensionRegistry.php
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/42/374042/1
diff --git a/includes/registration/ExtensionRegistry.php
b/includes/registration/ExtensionRegistry.php
index eac04a9..f3f467b 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -310,6 +310,9 @@
case 'array_merge':
$GLOBALS[$key] = array_merge( $val,
$GLOBALS[$key] );
break;
+ case 'override':
+ // Do nothing.
+ break;
default:
throw new UnexpectedValueException(
"Unknown merge strategy '$mergeStrategy'" );
}
--
To view, visit https://gerrit.wikimedia.org/r/374042
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6c7733c23c52bd77e291a1a436f0a81f37d71f3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: EddieGP <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
