From e3fc2f93a848ba7a763abe2c6bcd2c9a33751cc0 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Wed, 22 Dec 2010 11:57:43 +0100 Subject: [PATCH] Catch PEAR_Errors. --- framework/Share/lib/Horde/Share/Object/Datatree.php | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/framework/Share/lib/Horde/Share/Object/Datatree.php b/framework/Share/lib/Horde/Share/Object/Datatree.php index ac5cbb6aa..47d8c9441 100644 --- a/framework/Share/lib/Horde/Share/Object/Datatree.php +++ b/framework/Share/lib/Horde/Share/Object/Datatree.php @@ -79,7 +79,7 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object */ public function set($attribute, $value) { - return $this->datatreeObject->set($attribute, $value); + Horde_Exception_Pear::catchError($this->datatreeObject->set($attribute, $value)); } /** @@ -92,7 +92,7 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object */ public function get($attribute) { - return $this->datatreeObject->get($attribute); + return Horde_Exception_Pear::catchError($this->datatreeObject->get($attribute)); } /** @@ -102,7 +102,7 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object */ public function getId() { - return $this->datatreeObject->getId(); + return Horde_Exception_Pear::catchError($this->datatreeObject->getId()); } /** @@ -112,7 +112,7 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object */ public function getName() { - return $this->datatreeObject->getName(); + return Horde_Exception_Pear::catchError($this->datatreeObject->getName()); } /** @@ -120,7 +120,7 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object */ protected function _save() { - return $this->datatreeObject->save(); + Horde_Exception_Pear::catchError($this->datatreeObject->save()); } /** @@ -154,25 +154,22 @@ class Horde_Share_Object_Datatree extends Horde_Share_Object { $this->datatreeObject->data['perm'] = $perm->getData(); if ($update) { - return $this->datatreeObject->save(); + Horde_Exception_Pear::catchError($this->datatreeObject->save()); } - return true; } /** * Returns the permission of this share. * * @return Horde_Perms_Permission Permission object that represents the - * permissions on this share + * permissions on this share */ public function getPermission() { - $perm = new Horde_Perms_Permission($this->datatreeObject->getName()); + $perm = new Horde_Perms_Permission(Horde_Exception_Pear::catchError($this->datatreeObject->getName())); $perm->data = isset($this->datatreeObject->data['perm']) ? $this->datatreeObject->data['perm'] : array(); - return $perm; } - } -- 2.11.0