1.1 --- a/actions/EventAggregatorUpdate.py Fri Jan 24 22:53:15 2014 +0100
1.2 +++ b/actions/EventAggregatorUpdate.py Sat Jan 25 18:40:51 2014 +0100
1.3 @@ -9,6 +9,7 @@
1.4 from EventAggregatorSupport.Actions import get_date_functions
1.5 from EventAggregatorSupport import *
1.6 from MoinDateSupport import getParameterMonth
1.7 +from MoinSupport import getPageCacheKey, enforcePageCacheLimit
1.8 from MoinMoin.Page import Page, is_cache_exception
1.9 from MoinMoin import caching, config, log
1.10
1.11 @@ -30,7 +31,7 @@
1.12
1.13 # Attempt to get any previously cached view.
1.14
1.15 - key = page.getCacheKey(request)
1.16 + key = getPageCacheKey(page, request)
1.17 cache = caching.CacheEntry(request, page, key, scope='item')
1.18
1.19 if cache.exists():
1.20 @@ -97,7 +98,7 @@
1.21 # Attempt to cache the output and then send it.
1.22
1.23 try:
1.24 - page.enforceCacheLimit(request)
1.25 + enforcePageCacheLimit(page, request)
1.26 cache.update(output.encode(config.charset))
1.27 except caching.CacheError, exc:
1.28 logging.warning("Could not cache output for EventAggregatorUpdate in page %s: %s" % (pagename, str(exc)))