From d834ec001f399edbd21cada855cf33e84532695c Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 26 Aug 2010 09:53:08 -0600
Subject: [PATCH] Fix some issues that cropped up with new turba hook code

---
 turba/lib/Object.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/turba/lib/Object.php b/turba/lib/Object.php
index c54373b61..91ef61e9a 100644
--- a/turba/lib/Object.php
+++ b/turba/lib/Object.php
@@ -93,7 +93,7 @@ class Turba_Object {
         if (isset($this->attributes[$attribute])) {
             try {
                 return Horde::callHook('decode_attribute', array($attribute, $this->attributes[$attribute], $this), 'turba');
-            } catch (Horde_Exception_HookNotSet $e) {}
+            } catch (Horde_Exception_HookNotSet $e) {
             } catch (Turba_Exception $e) {}
         }
 
@@ -126,8 +126,8 @@ class Turba_Object {
     function setValue($attribute, $value)
     {
         try {
-            $value = Horde::callHook('encode_attribute', array($attribute, $value, $this->attributes[$attribute], $this), 'turba');
-        } catch (Horde_Exception_HookNotSet $e) {}
+            $value = Horde::callHook('encode_attribute', array($attribute, $value, isset($this->attributes[$attribute]) ? $this->attributes[$attribute] : null, $this), 'turba');
+        } catch (Horde_Exception_HookNotSet $e) {
         } catch (Turba_Exception $e) {}
 
         if (isset($this->driver->map[$attribute]) &&
-- 
2.11.0