dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
85b84f7
)
registration: Fix merge_strategy in manifest_version 2
author
Kunal Mehta
<legoktm@member.fsf.org>
Fri, 22 Jul 2016 21:59:07 +0000
(14:59 -0700)
committer
Reedy
<reedy@wikimedia.org>
Sun, 24 Jul 2016 11:47:40 +0000
(11:47 +0000)
merge_strategy is set in $data, which is the definition of the config
setting, not the default value of it ($value).
Change-Id: I12ee95892b2c157bb0beb97cf2cd5ef920b7d52e
includes/registration/ExtensionProcessor.php
patch
|
blob
|
history
diff --git
a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index
12218ce
..
0bf2842
100644
(file)
--- a/
includes/registration/ExtensionProcessor.php
+++ b/
includes/registration/ExtensionProcessor.php
@@
-392,7
+392,7
@@
class ExtensionProcessor implements Processor {
foreach ( $info['config'] as $key => $data ) {
$value = $data['value'];
if ( isset( $value['merge_strategy'] ) ) {
- $value[ExtensionRegistry::MERGE_STRATEGY] = $
value
['merge_strategy'];
+ $value[ExtensionRegistry::MERGE_STRATEGY] = $
data
['merge_strategy'];
}
$this->globals["$prefix$key"] = $value;
}