Unicode0.6.diff-2.5.1-more

File contents

--- lib/python/Products/PageTemplates/ZopePageTemplate.py.orig	Fri Aug 30 01:58:53 2002
+++ lib/python/Products/PageTemplates/ZopePageTemplate.py	Fri Aug 30 02:00:49 2002
@@ -185,8 +185,9 @@
         bound_names['options'] = kw
 
         try:
-            self.REQUEST.RESPONSE.setHeader('content-type',
-                                            self.content_type)
+            response = self.REQUEST.RESPONSE
+            if not response.headers.has_key('content-type'):
+                response.setHeader('content-type', self.content_type)
         except AttributeError: pass
 
         security=getSecurityManager()
--- lib/python/Products/PageTemplates/PageTemplateFile.py.orig	Wed Feb 27 20:13:03 2002
+++ lib/python/Products/PageTemplates/PageTemplateFile.py	Fri Aug 30 02:28:44 2002
@@ -83,8 +83,9 @@
         bound_names['options'] = kw
 
         try:
-            self.REQUEST.RESPONSE.setHeader('content-type',
-                                            self.content_type)
+            response = self.REQUEST.RESPONSE
+            if not response.headers.has_key('content-type'):
+                response.setHeader('content-type', self.content_type)
         except AttributeError: pass
 
         # Execute the template in a new security context.
--- Products/CMFCore/FSPageTemplate.py.orig	Sun Aug  4 18:24:36 2002
+++ Products/CMFCore/FSPageTemplate.py	Fri Aug 30 02:35:28 2002
@@ -162,7 +162,8 @@
         # call "inherited"
         result = self._ZPT_exec( bound_names, args, kw )
         if response is not None:
-            response.setHeader( 'content-type', self.content_type )
+            if not response.headers.has_key('content-type'):
+                response.setHeader('content-type', self.content_type)
         return result
  
     # Copy over more methods