[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php [Version-0_9_16-branch]

[Dave Hall]

CVSROOT:        /sources/phpgwapi
Module name:    phpgwapi
Branch:         Version-0_9_16-branch
Changes by:     Dave Hall <skwashd>     06/10/24 13:51:33

Modified files:
        inc            : class.contacts_sql.inc.php 

Log message:
        apply patch #5433

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_sql.inc.php?cvsroot=phpgwapi&only_with_tag=Version-0_9_16-branch&r1=1.17.2.2.2.75&r2=1.17.2.2.2.76

Patches:
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.17.2.2.2.75
retrieving revision 1.17.2.2.2.76
diff -u -b -r1.17.2.2.2.75 -r1.17.2.2.2.76
--- class.contacts_sql.inc.php  7 Dec 2005 12:09:11 -0000       1.17.2.2.2.75
+++ class.contacts_sql.inc.php  24 Oct 2006 13:51:33 -0000      1.17.2.2.2.76
@@ -6,7 +6,7 @@
        * @license http://www.gnu.org/licenses/gpl.html GNU General Public 
License
        * @package phpgwapi
        * @subpackage contacts
-       * @version $Id: class.contacts_sql.inc.php,v 1.17.2.2.2.75 2005/12/07 
12:09:11 skwashd Exp $
+       * @version $Id: class.contacts_sql.inc.php,v 1.17.2.2.2.76 2006/10/24 
13:51:33 skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        */
 
@@ -1538,7 +1538,7 @@
                {
                        if($sub_cat && $cat_id)
                        {
-                               $cat_id = array_merge(array($cat_id), 
$this->get_sub_cats($cat_id));
+                               $cat_id = array_merge(array($cat_id), 
(array)$this->get_sub_cats($cat_id));
                        }
 
                        $this->request('person_id');
@@ -1658,7 +1658,7 @@
 
                        if(is_array($cats))
                        {
-                               return array_merge($cats, 
$this->get_sub_cats($cats));
+                               return array_merge($cats, 
(array)$this->get_sub_cats($cats));
                        }
                }
 
@@ -3499,7 +3499,7 @@
                                        $categories = array($categories);
                                }
 
-                               $categories_array = array_merge($categories, 
$this->get_sub_cats($categories));
+                               $categories_array = array_merge($categories, 
(array)$this->get_sub_cats($categories));
                                if(count($categories_array) > 0)
                                {
                                        foreach($categories_array as $cat_id)