Fix regression when exporting single tags to iCalendar CATEGORIES.

horde · Sep 19, 2017 · 72560bf · 72560bf
1 parent 1ffa3a0
commit 72560bf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/kronolith/lib/Event.php b/kronolith/lib/Event.php
@@ -795,7 +795,11 @@ public function toiCalendar($calendar)
 
             // 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/docs/CHANGES b/nag/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.17-git
 -----------
 
+[jan] Fix regression when exporting single tags to iCalendar CATEGORIES.
 [jan] Officially support PHP 7.
 
 

diff --git a/nag/lib/Task.php b/nag/lib/Task.php
@@ -1298,7 +1298,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
@@ -33,6 +33,7 @@
  </stability>
  <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>
  <contents>
@@ -1832,6 +1833,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>