changeset 2135:2941aad83666

Merge with main.
author Karol 'grzywacz' Nowak <grzywacz@sul.uni.lodz.pl>
date Sat, 16 Jun 2007 23:15:08 +0200
parents 4e02a7cef128 (current diff) 283530fa9c52 (diff)
children 3accd05a36f3 85854afc1aa2
files
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Sat Jun 16 23:14:53 2007 +0200
+++ b/MoinMoin/Page.py	Sat Jun 16 23:15:08 2007 +0200
@@ -885,13 +885,16 @@
         """
         from MoinMoin import i18n
         from MoinMoin import security
+        request = self.request
         pi = {} # we collect the processing instructions here
-    
+
         body = self.body
+        # TODO: remove this hack once we have separate metadata and can use mimetype there
         if body.startswith('<?xml'): # check for XML content
             pi['lines'] = 0
             pi['format'] = "xslt"
             pi['formatargs'] = ''
+            pi['acl'] = security.AccessControlList(request.cfg, []) # avoid KeyError on acl check
             return pi
 
         meta = self.meta
@@ -900,7 +903,6 @@
         pi['format'] = self.cfg.default_markup or "wiki"
         pi['formatargs'] = ''
         pi['lines'] = len(meta)
-        request = self.request
         acl = []
         
         for verb, args in meta: