Fix regression when exporting single tags to iCalendar CATEGORIES.

horde · Sep 21, 2017 · a9e207d · a9e207d
1 parent c905b23
commit a9e207d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -758,7 +758,11 @@ public function toiCalendar($calendar, $includeFiles = true)
 
             // Tags
             if ($this->tags) {
-                $vEvent->setAttribute('CATEGORIES', '', array(), true, $this->tags);
+                if (count($this->tags == 1)) {
+                    $vEvent->setAttribute('CATEGORIES', $this->tags[0]);
+                } else {
+                    $vEvent->setAttribute('CATEGORIES', '', array(), true, $this->tags);
+                }
             }
 
             // Location

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
@@ -1409,7 +1409,11 @@ public function toiCalendar(Horde_Icalendar $calendar)
         }
 
         if ($this->tags) {
-            $vTodo->setAttribute('CATEGORIES', '', array(), true, $this->tags);
+            if (count($this->tags) == 1) {
+                $vTodo->setAttribute('CATEGORIES', $this->tags[0]);
+            } else {
+                $vTodo->setAttribute('CATEGORIES', '', array(), true, $this->tags);
+            }
         }
 
         /* Get the task's history. */

diff --git a/nag/package.xml b/nag/package.xml
@@ -1873,6 +1873,7 @@
    <date>2017-08-15</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [jan] Fix regression when exporting single tags to iCalendar CATEGORIES.
 * [jan] Officially support PHP 7.
    </notes>
   </release>