From: Gunnar Wrobel <p@rdus.de>
Date: Tue, 14 Apr 2009 04:30:15 +0000 (+0200)
Subject: Temporary fix for the home postal address handler.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b5e7f80b11b69e21a926686c23be4ccdbd69948e;p=horde.git

Temporary fix for the home postal address handler.
---

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Inetorgperson.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Inetorgperson.php
index 363aa80e2..9b51aa344 100644
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Inetorgperson.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Inetorgperson.php
@@ -164,8 +164,6 @@ class Horde_Kolab_Server_Object_Inetorgperson extends Horde_Kolab_Server_Object_
             self::ATTRIBUTE_HOMEPOSTALADDRESS => array(
                 'base' => array(
                     self::ATTRARRAY_HOMEPOSTALADDRESS,
-                    self::ATTRIBUTE_GIVENNAME,
-                    self::ATTRIBUTE_SN
                 ),
                 'method' => 'setHomePostalAddressHash',
             ),
@@ -266,6 +264,9 @@ class Horde_Kolab_Server_Object_Inetorgperson extends Horde_Kolab_Server_Object_
     {
         $result    = array();
         $addresses = $this->get(self::ATTRIBUTE_HOMEPOSTALADDRESS);
+	if (empty($addresses)) {
+	  return $addresses;
+	}
         if (!is_array($addresses)) {
             $addresses = array($addresses);
         }