Author: nathangray
New Revision: 31157
URL: http://www.egroupware.org/viewvc/egroupware?rev=31157&view=rev
Log:
Make sure criteria is an array before checking for cat_id
Modified:
trunk/addressbook/inc/class.addressbook_sql.inc.php
Modified: trunk/addressbook/inc/class.addressbook_sql.inc.php
URL: http://www.egroupware.org/viewvc/egroupware/trunk/addressbook/inc/class.addressbook_sql.inc.php?rev=31157&r1=31156&r2=31157&view=diff
— trunk/addressbook/inc/class.addressbook_sql.inc.php (original)
+++ trunk/addressbook/inc/class.addressbook_sql.inc.php Mon Jun 28 16:11:20 2010
@@ -247,7 +247,7 @@
$owner = isset($filter[‘owner’]) ? $filter[‘owner’] : (isset($criteria[‘owner’]) ? $criteria[‘owner’] : null);
// fix cat_id criteria to search in comma-separated multiple cats and return subcats
-
if (($cats = $criteria['cat_id']))
-
if (is_array($criteria) && ($cats = $criteria['cat_id'])) { $criteria += $this->_cat_search($criteria['cat_id'],$not); unset($criteria['cat_id']);
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first – http://p.sf.net/sfu/sprint-com-first
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs