Remove obsolete postalAddress attribute.

diff --git a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
index c66539b..9f864a8 100644 (file)
--- a/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
+++ b/framework/Kolab_Server/lib/Horde/Kolab/Server/Object/Organizationalperson.php
@@ -146,9 +146,8 @@ class Horde_Kolab_Server_Object_Organizationalperson extends Horde_Kolab_Server_
             $postal_data['street_segment'] = $postal_data[self::ATTRIBUTE_STREET];
         }
 
-        $info[$key] = sprintf('%s$%s$%s$%s %s',
+        $info[$key] = sprintf('%s$%s$%s %s',
                               $postal_data[self::ATTRIBUTE_SN],
-                              $postal_data[self::ATTRIBUTE_POSTALADDRESS],
                               $postal_data['street_segment'],
                               $postal_data[self::ATTRIBUTE_POSTALCODE],
                               $postal_data[self::ATTRIBUTE_CITY]);

diff --git a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php
index 775d3a8..919a182 100644 (file)
--- a/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php
+++ b/framework/Kolab_Server/test/Horde/Kolab/Server/OrgPersonTest.php
@@ -127,22 +127,22 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server
     public function testHandlingAPostalAddress($server)
     {
         $person = $this->assertAdd($server, $this->objects[0],
-                                   array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => 'Kolab_Server_OrgPersonTest_123$$$ '));
+                                   array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => 'Kolab_Server_OrgPersonTest_123$$ '));
 
         $this->assertStoreFetch($person, $server,
                                 array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_SN => 'Kolab_Server_OrgPersonTest_456'),
-                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_456$$$ ')));
+                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_456$$ ')));
 
         $this->assertStoreFetch($person, $server,
                                 array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_SN => 'Kolab_Server_OrgPersonTest_123',
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => 'Street 1',
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALCODE => '12345',
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_CITY => 'Nowhere'),
-                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$Street 1$12345 Nowhere')));
+                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$Street 1$12345 Nowhere')));
         $this->assertStoreFetch($person, $server,
                                 array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => 'öäü/)(="§%$&§§$\'*',
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => null),
-                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$öäü/)(="§%\24&§§\24\'*$12345 Nowhere')));
+                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$öäü/)(="§%\24&§§\24\'*$12345 Nowhere')));
 
         $this->assertStoreFetch($person, $server,
                                 array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_STREET => null,
@@ -151,7 +151,7 @@ class Horde_Kolab_Server_OrgPersonTest extends Horde_Kolab_Test_Server
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => '',
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTOFFICEBOX => null,
                                       Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_CITY => null),
-                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$$ ')));
+                                array(Horde_Kolab_Server_Object_Organizationalperson::ATTRIBUTE_POSTALADDRESS => array('Kolab_Server_OrgPersonTest_123$$ ')));
     }