From c9e40c0517f2d775e48b4f834abbf9eced91fa5c Mon Sep 17 00:00:00 2001
From: nbm <nbm@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Fri, 2 Sep 2005 16:28:56 +0000
Subject: [PATCH] PHP5 fix - array_merge no longer handles being passed a non-array (such as null)

---
 lib/groups/GroupUtil.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/groups/GroupUtil.php b/lib/groups/GroupUtil.php
index f6a1171..086e49b 100644
--- a/lib/groups/GroupUtil.php
+++ b/lib/groups/GroupUtil.php
@@ -234,7 +234,10 @@ class GroupUtil {
         $aParams = array($oUser->getID());
         $aGroupIDs = DBUtil::getResultArrayKey(array($sQuery, $aParams), "group_id");
         foreach ($aGroupIDs as $iGroupID) {
-            $aGroupIDs = array_merge($aGroupIDs, KTUtil::arrayGet($aGroupArray, $iGroupID));
+            $aExtraIDs = KTUtil::arrayGet($aGroupArray, $iGroupID);
+            if (is_array($aExtraIDs)) {
+                $aGroupIDs = array_merge($aGroupIDs, $aExtraIDs);
+            }
         }
         $aGroupIDs = array_unique($aGroupIDs);
         sort($aGroupIDs);
--
libgit2 0.21.4