From: John Kirk <john@civifirst.com>
Date: Sun, 20 Nov 2016 03:23:02 +0000 (+0000)
Subject: Made sure that array_merge accepts two arrays as expected.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ce63c32e4a3d0d83965473db44827bc2c8955f28;p=civicrm-core.git

Made sure that array_merge accepts two arrays as expected.
---

diff --git a/CRM/Extension/Manager.php b/CRM/Extension/Manager.php
index 013c9aa9a0..3306908dee 100644
--- 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());