From 9619815653550bab370d10e1c13a80887ffef372 Mon Sep 17 00:00:00 2001 From: Jan Date: Tue, 8 Jun 2010 18:52:11 +0100 Subject: [PATCH] Hotfix to catch PEAR_Errors, still needs to be converted to Horde_Db. Catch if user doesn't have any shares yet. --- framework/Group/lib/Horde/Group/Contactlists.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/framework/Group/lib/Horde/Group/Contactlists.php b/framework/Group/lib/Horde/Group/Contactlists.php index 493c37b0a..1b40ba9ce 100644 --- a/framework/Group/lib/Horde/Group/Contactlists.php +++ b/framework/Group/lib/Horde/Group/Contactlists.php @@ -349,6 +349,9 @@ class Horde_Group_Contactlists extends Horde_Group $owners[] = $params['name']; } } + if (!$owners) { + return array(); + } } else { $owners = array($GLOBALS['registry']->getAuth()); } @@ -361,10 +364,14 @@ class Horde_Group_Contactlists extends Horde_Group . $source['map']['__type'] . ' = \'Group\' AND ' . $source['map']['__owner'] . ' IN (' . implode(',', $owner_ids ) . ')'; - $results = $this->_db[$key]->getAssoc($sql); - foreach ($results as $id => $name) { - $groups[$key . ':' . $id] = $name; - } + $results = $this->_db[$key]->getAssoc($sql); + if (is_a($results, 'PEAR_Error')) { + Horde::logMessage($results); + throw new Horde_Group_Exception($results); + } + foreach ($results as $id => $name) { + $groups[$key . ':' . $id] = $name; + } } $this->_groupList = $groups; -- 2.11.0