# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1312929738 -7200
# Node ID 237522af2e22a0e8905d84b80599e5f3d8a21c82
# Parent  2125a3ee359102989f5d379cfe71e3fa80f9a61b
Fixed Moin 1.9 compatibility when using WikiDicts.

diff -r 2125a3ee3591 -r 237522af2e22 EventAggregatorSupport.py
--- a/EventAggregatorSupport.py	Tue Jul 12 00:01:06 2011 +0200
+++ b/EventAggregatorSupport.py	Wed Aug 10 00:42:18 2011 +0200
@@ -100,6 +100,15 @@
             category_regexp = re.compile(u'^%s$' % ur'(?P<all>Category(?P<key>(?!Template)\S+))', re.UNICODE)
         return category_regexp
 
+def getWikiDict(pagename, request):
+    if Page(request, pagename).exists() and request.user.may.read(pagename):
+        if hasattr(request.dicts, "dict"):
+            return request.dicts.dict(pagename)
+        else:
+            return request.dicts[pagename]
+    else:
+        return None
+
 def int_or_none(x):
     if x is None:
         return x
diff -r 2125a3ee3591 -r 237522af2e22 macros/EventAggregator.py
--- a/macros/EventAggregator.py	Tue Jul 12 00:01:06 2011 +0200
+++ b/macros/EventAggregator.py	Wed Aug 10 00:42:18 2011 +0200
@@ -1515,15 +1515,8 @@
 
         # Get the maps and locations.
 
-        if request.user.may.read(maps_page):
-            maps = request.dicts.dict(maps_page)
-        else:
-            maps = None
-
-        if request.user.may.read(locations_page):
-            locations = request.dicts.dict(locations_page)
-        else:
-            locations = None
+        maps = getWikiDict(maps_page, request)
+        locations = getWikiDict(locations_page, request)
 
         # Get the map image definition.