From 3fa5210b1f1a7b72d43292c720707baa287f4fda Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sat, 14 Aug 2010 13:44:48 -0400 Subject: [PATCH] Fix category handling from AS messages, use a GUID for uid, not a random id --- turba/lib/Driver.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php index 153e09fb5..062851bcb 100644 --- a/turba/lib/Driver.php +++ b/turba/lib/Driver.php @@ -789,7 +789,7 @@ class Turba_Driver } if (!isset($attributes['__uid'])) { - $attributes['__uid'] = strval(new Horde_Support_Randomid()); + $attributes['__uid'] = strval(new Horde_Support_Guid()); } $key = $attributes['__key'] = $this->_makeKey($this->toDriverKeys($attributes)); @@ -2497,10 +2497,9 @@ class Turba_Driver /* Categories */ if (count($message->categories)) { - $hash['category']['value'] = Horde_String::convertCharset(implode(';', $message->categories), 'utf-8', $charset); - $hash['category']['new'] = true; + $hash['category'] = Horde_String::convertCharset(implode('|', $message->categories), 'utf-8', $charset); } elseif (!$message->isGhosted('categories')) { - $hash['category']['value'] = ''; + $hash['category'] = ''; } /* Birthday and Anniversary */ -- 2.11.0