projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5ab2a13)
Made sure that array_merge accepts two arrays as expected.
authorJohn Kirk <john@civifirst.com>
Sun, 20 Nov 2016 03:23:02 +0000 (03:23 +0000)
committerJohn Kirk <accounts@civifirst.com>
Mon, 9 Oct 2017 18:27:52 +0000 (18:27 +0000)
CRM/Extension/Manager.php patch | blob | blame | history

diff --git a/CRM/Extension/Manager.php b/CRM/Extension/Manager.php
index 013c9aa9a03bafd980a7d75718ef2cd240d3c510..3306908dee943e6c438e8fb12e20bf319b15dbc1 100644 (file)
--- a/CRM/Extension/Manager.php
+++ b/CRM/Extension/Manager.php
@@ -614,7 +614,7 @@ class CRM_Extension_Manager {
       }
       elseif ($info && $info->requires) {
         $sorter->add($key, $info->requires);
-        $todoKeys = array_merge($todoKeys, $info->requires);
+        $todoKeys = array_merge($todoKeys, array($info->requires));
       }
       else {
         $sorter->add($key, array());