From 88c74fa16707ab8d286e42dfe4d4d28bc984fceb Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 29 Mar 2016 13:40:45 +0200 Subject: [PATCH] Add missing UID in birthdays calendar exports/feed (T855) --- plugins/calendar/drivers/calendar_driver.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugins/calendar/drivers/calendar_driver.php b/plugins/calendar/drivers/calendar_driver.php index 32586666..b146343c 100644 --- a/plugins/calendar/drivers/calendar_driver.php +++ b/plugins/calendar/drivers/calendar_driver.php @@ -704,8 +704,10 @@ abstract class calendar_driver // birthday is within requested range if ($bday <= $end && $bday >= $start) { $age = $this_year - $birthyear; + $uid = rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $this_year); $event = array( - 'id' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $this_year), + 'id' => $uid, + 'uid' => $uid, 'calendar' => self::BIRTHDAY_CALENDAR_ID, 'title' => $event_title, 'description' => $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar'), @@ -765,10 +767,11 @@ abstract class calendar_driver $display_name = rcube_addressbook::compose_display_name($contact); $event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar'); + $uid = rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear); $event = array( - 'id' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year), - 'uid' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear), + 'id' => $uid, + 'uid' => $uid, 'calendar' => self::BIRTHDAY_CALENDAR_ID, 'title' => $event_title, 'description' => '',