# HG changeset patch # User Paul Boddie # Date 1396204799 -7200 # Node ID d716be4aad71e2761f267fcca6b873c74583b5bd # Parent ae498249090e9835b18d4d4caffe2e80db32d09a# Parent 41170d9999bc754931b8c5ab54ac743f2a1ccb7c Merged changes from the default branch. diff -r ae498249090e -r d716be4aad71 EventAggregatorSupport/Resources.py --- a/EventAggregatorSupport/Resources.py Sun Mar 30 20:34:12 2014 +0200 +++ b/EventAggregatorSupport/Resources.py Sun Mar 30 20:39:59 2014 +0200 @@ -109,8 +109,9 @@ for a computed name to be used). """ - store = ItemStore(Page(request, page_name), store_name, lockdir_name) - return parseEventsInStore(store, request) + page = Page(request, page_name) + store = ItemStore(page, store_name, lockdir_name) + return parseEventsInStore(store, getPageURL(page), request) def getEventResourcesFromSource(url, format, expected_content_type, calendar_start, calendar_end, request):