From 5cc3058eda136b369e83b34d024833f2853ffe2b Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 28 Jun 2010 14:12:03 +0000 Subject: [PATCH] Backport 31157: Make sure criteria is an array before checking for cat_id --- addressbook/inc/class.addressbook_sql.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php index 8b5aad9e3f..9969ca8ad4 100644 --- a/addressbook/inc/class.addressbook_sql.inc.php +++ b/addressbook/inc/class.addressbook_sql.inc.php @@ -247,7 +247,7 @@ class addressbook_sql extends so_sql_cf $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']);