[Zope-Checkins] CVS: Zope/lib/python/Products/PageTemplates - ZopePageTemplate.py:1.42.4.1

Chris McDonough chrism@zope.com
Thu, 29 Aug 2002 01:31:51 -0400


Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv30531/lib/python/Products/PageTemplates

Modified Files:
      Tag: chrism-install-branch
	ZopePageTemplate.py 
Log Message:
CVS up -j from HEAD on chrism-installer-branch.

Sorry folks on various mailing lists whom are subjected to this.
If I knew how to cut down on unnecessary checkin messages to
the lists, I would.



=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.42 => 1.42.4.1 ===
--- Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py:1.42	Wed Aug 14 18:17:24 2002
+++ Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py	Thu Aug 29 01:31:16 2002
@@ -202,8 +202,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