# HG changeset patch # User Paul Boddie # Date 1298081479 -3600 # Node ID f7c1f4b3e1a3d9208a9eb7bd14c4ca82fe94d0ff # Parent 3c602433e6b549fdce35db62c4ed729717313607 Fixed start and end request parameter overriding to work with unnamed calendars. (Imported from revision 134.) diff -r 3c602433e6b5 -r f7c1f4b3e1a3 macros/EventAggregator.py --- a/macros/EventAggregator.py Sat Feb 19 03:06:03 2011 +0100 +++ b/macros/EventAggregator.py Sat Feb 19 03:11:19 2011 +0100 @@ -808,9 +808,8 @@ # Find request parameters to override settings. - if calendar_name is not None: - calendar_start = EventAggregatorSupport.getFormMonth(request, calendar_name, "start") or calendar_start - calendar_end = EventAggregatorSupport.getFormMonth(request, calendar_name, "end") or calendar_end + calendar_start = EventAggregatorSupport.getFormMonth(request, calendar_name, "start") or calendar_start + calendar_end = EventAggregatorSupport.getFormMonth(request, calendar_name, "end") or calendar_end mode = EventAggregatorSupport.getQualifiedParameter(request, calendar_name, "mode", mode or "calendar")