From c37208db81b5ca71645e0e38fde7bd4ae51278cb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Dec 2011 16:12:14 +0000 Subject: [PATCH] See ChangeLog. Monotone-Parent: 1f603d18ef908652156b3dbae521f53c6527c63c Monotone-Revision: 13364682a0f8ae52e3545893494b2a7ec0a88529 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-23T16:12:14 --- ChangeLog | 3 +++ UI/PreferencesUI/UIxPreferences.m | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 06348ca15..130f76ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-12-23 Francis Lachapelle + * UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return + current date when no end date is defined. + * Tools/SOGoToolUserPreferences.m (-run): fixed possible out of bound exception when parsing arguments. diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index c68246962..91ad95ca4 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -914,7 +914,10 @@ time = [[vacationOptions objectForKey: @"endDate"] intValue]; - return [NSCalendarDate dateWithTimeIntervalSince1970: time]; + if (time > 0) + return [NSCalendarDate dateWithTimeIntervalSince1970: time]; + else + return [NSCalendarDate calendarDate]; } /* mail forward */