[Phpgroupware-cvs] phpgwapi/inc class.contacts_sql.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     06/10/02 00:33:44

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

Log message:
        patch #5433

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/inc/class.contacts_sql.inc.php?cvsroot=phpgwapi&r1=1.33&r2=1.34

Patches:
Index: class.contacts_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/inc/class.contacts_sql.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.contacts_sql.inc.php  9 Sep 2006 11:43:15 -0000       1.33
+++ class.contacts_sql.inc.php  2 Oct 2006 00:33:44 -0000       1.34
@@ -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.33 2006/09/09 11:43:15 
skwashd Exp $
+       * @version $Id: class.contacts_sql.inc.php,v 1.34 2006/10/02 00:33:44 
skwashd Exp $
        * @internal Development of this application was funded by 
http://www.sogrp.com
        */
 
@@ -1594,7 +1594,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');
@@ -1714,7 +1714,7 @@
 
                        if(is_array($cats))
                        {
-                               return array_merge($cats, 
$this->get_sub_cats($cats));
+                               return array_merge($cats, 
(array)$this->get_sub_cats($cats));
                        }
                }
 
@@ -2226,6 +2226,7 @@
                */
                function edit_org_person_relation($org_id='', $person_id='', 
$data=array(), $action=PHPGW_SQL_RETURN_SQL)
                {
+                       $criteria = array();
                        $relation = createObject('phpgwapi.contact_org_person');
                        if($org_id && $person_id)
                        {
@@ -3524,7 +3525,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)