From 1246d77e28ce984ae0031ea5d8bd2a6ff26b9f67 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 21 Feb 2019 17:49:54 +0100 Subject: [PATCH] fix Lightning work-around for %40 --- calendar/inc/class.calendar_ical.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_ical.inc.php b/calendar/inc/class.calendar_ical.inc.php index 0c98078d9a..39079fd776 100644 --- a/calendar/inc/class.calendar_ical.inc.php +++ b/calendar/inc/class.calendar_ical.inc.php @@ -2713,6 +2713,8 @@ class calendar_ical extends calendar_boupdate } // fall throught case 'ATTENDEE': + // work around Ligthning sending @ as %40 + $attributes['value'] = str_replace('%40', '@', $attributes['value']); if (isset($attributes['params']['PARTSTAT'])) { $attributes['params']['STATUS'] = $attributes['params']['PARTSTAT']; @@ -2758,8 +2760,6 @@ class calendar_ical extends calendar_boupdate { $email = $attributes['value']; } - // work around Ligthning sending @ as %40 - $email = str_replace('%40', '@', $email); // try X-EGROUPWARE-UID, but only if it resolves to same email (otherwise we are in trouble if different EGw installs talk to each other) if (!$uid && !empty($attributes['params']['X-EGROUPWARE-UID']) && ($res_info = $this->resource_info($attributes['params']['X-EGROUPWARE-UID'])) &&