[jan] Fix unprocessed placeholder when show recurring event's end dat…

…es (Bug #14768).
horde · Jan 22, 2018 · 16400fd · 16400fd
1 parent a7b4e30
commit 16400fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/changelog.yml b/doc/changelog.yml
@@ -72,6 +72,7 @@
     identifier: GPL-2.0
     uri: http://www.horde.org/licenses/gpl
   notes: |
+    [jan] Fix unprocessed placeholder when show recurring event's end dates (Bug #14768).
     [jan] Fix retrieving one of multiple public PGP keys (mh <mh@immerda.ch>).
     [jan] Fix generating PDF thumbnails with imagick extension 3.3.0+ (arjen+horde@de-korte.org, Bug #14697).
 6.2.21:

diff --git a/lib/Mime/Viewer/Itip.php b/lib/Mime/Viewer/Itip.php
@@ -472,7 +472,7 @@ protected function _vEvent($vevent, $id, $method = 'PUBLISH', $components = arra
                 }
             } catch (Horde_ICalendar_Exception $e) {}
 
-            $view->recurrence = $recurrence->toString($prefs->getValue('date_format'));
+            $view->recurrence = $recurrence->toString($prefs->getValue('date_format'), $prefs->getValue('time_format'));
             $view->exceptions = array();
             foreach ($components as $key => $component) {
                 try {