1.1 --- a/EventAggregatorSupport.py Sat Apr 04 23:27:16 2009 +0200
1.2 +++ b/EventAggregatorSupport.py Sat Apr 04 23:40:48 2009 +0200
1.3 @@ -680,4 +680,13 @@
1.4 else:
1.5 return page.link_to_raw(request, text, query_string)
1.6
1.7 +def getPageURL(request, page):
1.8 +
1.9 + "Using 'request', return the URL of 'page'."
1.10 +
1.11 + if isMoin15():
1.12 + return request.getQualifiedURL(page.url(request))
1.13 + else:
1.14 + return request.getQualifiedURL(page.url(request, relative=0))
1.15 +
1.16 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/actions/EventAggregatorSummary.py Sat Apr 04 23:27:16 2009 +0200
2.2 +++ b/actions/EventAggregatorSummary.py Sat Apr 04 23:40:48 2009 +0200
2.3 @@ -177,7 +177,9 @@
2.4
2.5 # Define the last modified time.
2.6
2.7 - headers.append("Last-Modified: %s" % EventAggregatorSupport.getHTTPTimeString(latest_timestamp))
2.8 + if latest_timestamp is not None:
2.9 + headers.append("Last-Modified: %s" % EventAggregatorSupport.getHTTPTimeString(latest_timestamp))
2.10 +
2.11 send_headers(headers)
2.12
2.13 # iCalendar output...
2.14 @@ -192,7 +194,7 @@
2.15 # Get the summary details.
2.16
2.17 event_summary = EventAggregatorSupport.getEventSummary(event_page, event_details)
2.18 - link = request.getQualifiedURL(event_page.url(request, relative=0))
2.19 + link = EventAggregatorSupport.getPageURL(request, event_page)
2.20
2.21 # Output the event details.
2.22
2.23 @@ -232,7 +234,7 @@
2.24 # Get the summary details.
2.25
2.26 event_summary = EventAggregatorSupport.getEventSummary(event_page, event_details)
2.27 - link = request.getQualifiedURL(event_page.url(request, relative=0))
2.28 + link = EventAggregatorSupport.getPageURL(request, event_page)
2.29
2.30 request.write('<item>\r\n')
2.31 request.write('<title>%s</title>\r\n' % wikiutil.escape(event_summary))