[Zope3-checkins] CVS: Zope3/src/zope/app/content - configure.zcml:1.6 zpt.py:1.5

[Albertas Agejevas]

Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv13825/src/zope/app/content

Modified Files:
	configure.zcml zpt.py 
Log Message:
Don't expand macros in ZPTPage; security assertion for the macros attribute

=== Zope3/src/zope/app/content/configure.zcml 1.5 => 1.6 ===
--- Zope3/src/zope/app/content/configure.zcml:1.5	Sat Dec 28 12:49:25 2002
+++ Zope3/src/zope/app/content/configure.zcml	Mon Dec 30 11:41:21 2002
@@ -134,7 +134,7 @@
 
   <require
       permission="zope.View"
-      attributes="__call__" />
+      attributes="__call__ macros" />
 
   <require
       permission="zope.ManageContent"


=== Zope3/src/zope/app/content/zpt.py 1.4 => 1.5 ===
--- Zope3/src/zope/app/content/zpt.py:1.4	Sat Dec 28 12:49:25 2002
+++ Zope3/src/zope/app/content/zpt.py	Mon Dec 30 11:41:21 2002
@@ -35,6 +35,8 @@
 
     __implements__ = IZPTPage, IRenderZPTPage
 
+    expand = False
+
     def getSource(self):
         '''See IZPTPage'''
         return self.read()