Commit b6596116 authored by matt@zope.com's avatar matt@zope.com

Route of change where DTMLMethod removed self.__dict__['validate'] and would

raise an error on duplicat removal due to recursive entry.
parent a85fb569
......@@ -170,6 +170,10 @@ Zope Changes
work properly (thanks to Alastair Burt for reporting and submitting
the patch).
- Fixed case where DTMLMethod.py complained when it tried to remove
the accelerated DTML security validation routine after recursive
entry.
Zope 2.4 beta 2
Bugs fixed
......
......@@ -84,7 +84,7 @@
##############################################################################
"""DTML Method objects."""
__version__='$Revision: 1.69 $'[11:-2]
__version__='$Revision: 1.70 $'[11:-2]
import History
from Globals import HTML, DTMLFile, MessageDialog
......@@ -200,7 +200,8 @@ class DTMLMethod(RestrictedDTML, HTML, Acquisition.Implicit, RoleManager,
finally:
security.removeContext(self)
del self.__dict__['validate']
try: del self.__dict__['validate']
except: pass
have_key=RESPONSE.headers.has_key
if not (have_key('content-type') or have_key('Content-Type')):
......@@ -214,6 +215,9 @@ class DTMLMethod(RestrictedDTML, HTML, Acquisition.Implicit, RoleManager,
self.ZCacheable_set(result)
return result
def validate(self, inst, parent, name, value, md=None):
return getSecurityManager().validate(inst, parent, name, value)
def ZDocumentTemplate_beforeRender(self, md, default):
# Tries to get a cached value.
if self._cache_namespace_keys:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment