From 4d3b94f53ce6356c7fa5263342247bee0ca4f881 Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Fri, 6 Aug 2010 20:44:59 -0400 Subject: [PATCH] Only include Recurrence.Until in the AS message if the event has it set. The default date with a year of 9999 breaks at least the moto droid client. --- framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php index 4a19cd1d7..7344e4ad3 100644 --- a/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php +++ b/framework/ActiveSync/lib/Horde/ActiveSync/Message/Appointment.php @@ -391,10 +391,10 @@ class Horde_ActiveSync_Message_Appointment extends Horde_ActiveSync_Message_Base $r->interval = $recurrence->recurInterval; } - /* AS messages can only have one or the other, not both */ + /* AS messages can only have one or the other (or none), not both */ if ($recurrence->hasRecurCount()) { $r->occurrences = $recurrence->getRecurCount(); - } else { + } elseif ($recurrence->hasRecurEnd()) { $r->until = $recurrence->getRecurEnd(); } -- 2.11.0