[CMF-checkins] CVS: Products/CMFCore - FSDTMLMethod.py:1.25

[Jens Vagelpohl]

Update of /cvs-repository/Products/CMFCore
In directory cvs.zope.org:/tmp/cvs-serv14409/CMFCore

Modified Files:
	FSDTMLMethod.py 
Log Message:
- FSDTMLMethod: Small code cleanup to remove duplicate variable
  definition (http://www.zope.org/Collectors/CMF/291)


=== Products/CMFCore/FSDTMLMethod.py 1.24 => 1.25 ===
--- Products/CMFCore/FSDTMLMethod.py:1.24	Thu Aug 12 11:07:39 2004
+++ Products/CMFCore/FSDTMLMethod.py	Fri Oct 29 16:22:47 2004
@@ -124,16 +124,16 @@
         security=getSecurityManager()
         security.addContext(self)
         try:
+            r = Globals.HTML.__call__(self, client, REQUEST, **kw)
+
             if client is None:
                 # Called as subtemplate, so don't need error propagation!
-                r = Globals.HTML.__call__(self, client, REQUEST, **kw)
                 if RESPONSE is None: result = r
                 else: result = decapitate(r, RESPONSE)
                 if not self._cache_namespace_keys:
                     self.ZCacheable_set(result)
                 return result
 
-            r = Globals.HTML.__call__(self, client, REQUEST, **kw)
             if type(r) is not type('') or RESPONSE is None:
                 if not self._cache_namespace_keys:
                     self.ZCacheable_set(r)