dépôts / lhc / web / wiklou.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 07f2de7) | patch
registration: Fix merging of array_plus
authorKunal Mehta <legoktm@gmail.com>
Thu, 17 Sep 2015 17:28:38 +0000 (10:28 -0700)
committerKunal Mehta <legoktm@gmail.com>
Thu, 17 Sep 2015 17:29:02 +0000 (10:29 -0700)
commit0a83ef3cf765385691a099dbb85e283b43dc5465
treee7bd02cdc5dc4a588764a1324e7c1b93e1a25604tree | snapshot
parent07f2de77cdc799d9cda6ca8b0a97a6cd5eaa6353commit | diff
registration: Fix merging of array_plus

We want the local configuration ($GLOBALS[$key]) to override the default
values ($val). This matches what `array_merge` does.

Bug: T112868
Change-Id: I9c333a1fa67d3f24e09ffed3072b2897389f6139
includes/registration/ExtensionRegistry.php diff | blob | history
tests/phpunit/includes/registration/ExtensionRegistryTest.php diff | blob | history
Wiklou, le Wiki du Wiklou