changeset 1552:f9639ed07af2

using request.cfg.cache more
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 14 Sep 2006 23:09:53 +0200
parents 0d2f2d531e81
children 24ef62e7013f
files MoinMoin/config/multiconfig.py MoinMoin/security/__init__.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/config/multiconfig.py	Thu Sep 14 22:59:17 2006 +0200
+++ b/MoinMoin/config/multiconfig.py	Thu Sep 14 23:09:53 2006 +0200
@@ -599,9 +599,9 @@
         # Cache variables for the properties below
         self._iwid = self._iwid_full = self._meta_dict = None
 
-        self._acl_rights_before = AccessControlList(self, [self.acl_rights_before])
-        self._acl_rights_default = AccessControlList(self, [self.acl_rights_default])
-        self._acl_rights_after = AccessControlList(self, [self.acl_rights_after])
+        self.cache.acl_rights_before = AccessControlList(self, [self.acl_rights_before])
+        self.cache.acl_rights_default = AccessControlList(self, [self.acl_rights_default])
+        self.cache.acl_rights_after = AccessControlList(self, [self.acl_rights_after])
 
         if self.url_prefix is not None: # remove this code when url_prefix setting is removed
             self.url_prefix_static = self.url_prefix
--- a/MoinMoin/security/__init__.py	Thu Sep 14 22:59:17 2006 +0200
+++ b/MoinMoin/security/__init__.py	Thu Sep 14 23:09:53 2006 +0200
@@ -222,10 +222,10 @@
            Returns boolean answer.
         """
         if self.acl is None: # no #acl used on Page
-            acl_page = request.cfg._acl_rights_default.acl
+            acl_page = request.cfg.cache.acl_rights_default.acl
         else: # we have a #acl on the page (self.acl can be [] if #acl is empty!)
             acl_page = self.acl
-        acl = request.cfg._acl_rights_before.acl + acl_page + request.cfg._acl_rights_after.acl
+        acl = request.cfg.cache.acl_rights_before.acl + acl_page + request.cfg.cache.acl_rights_after.acl
         is_group_member = request.dicts.has_member
         group_re = request.cfg.cache.page_group_regex
         allowed = None