diff --git a/VERSION b/VERSION index f9bcef42..e024d1ab 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.4.6-stable+timestamp.2013.05.16.22.02.34 +Version 2.4.6-stable+timestamp.2013.05.17.13.52.49 diff --git a/gluon/serializers.py b/gluon/serializers.py index 336d3761..88e72a78 100644 --- a/gluon/serializers.py +++ b/gluon/serializers.py @@ -127,7 +127,8 @@ def csv(value): return '' -def ics(events, title=None, link=None, timeshift=0, **ignored): +def ics(events, title=None, link=None, timeshift=0, calname=True, + **ignored): import datetime title = title or '(unkown)' if link and not callable(link): @@ -135,7 +136,8 @@ def ics(events, title=None, link=None, timeshift=0, **ignored): '[id]', str(item['id'])) s = 'BEGIN:VCALENDAR' s += '\nVERSION:2.0' - s += '\nX-WR-CALNAME:%s' % title + if not calname is False: + s += '\nX-WR-CALNAME:%s' % (calname or title) s += '\nSUMMARY:%s' % title s += '\nPRODID:Generated by web2py' s += '\nCALSCALE:GREGORIAN'