[CMF-checkins] CVS: Products/CMFCore - FSPageTemplate.py:1.26.2.5

Jens Vagelpohl jens at dataflake.org
Mon Mar 7 06:43:14 EST 2005


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

Modified Files:
      Tag: CMF-1_5-branch
	FSPageTemplate.py 
Log Message:
- fixing the fix


=== Products/CMFCore/FSPageTemplate.py 1.26.2.4 => 1.26.2.5 ===
--- Products/CMFCore/FSPageTemplate.py:1.26.2.4	Mon Mar  7 06:30:14 2005
+++ Products/CMFCore/FSPageTemplate.py	Mon Mar  7 06:43:14 2005
@@ -86,8 +86,12 @@
 
         if reparse:
             # If we already have a content_type set it must come from a
-            # .metadata file and we should always honor that
-            if getattr(self, 'content_type', None) is None:
+            # .metadata file and we should always honor that. The content
+            # type is initialized as text/html by default, so we only
+            # attempt further detection if the default is encountered.
+            # One previous misbehavior remains: It is not possible to
+            # force a text./html type if parsing detects it as XML.
+            if getattr(self, 'content_type', 'text/html') == 'text/html':
                 xml_info = xml_detect_re.match(data)
                 if xml_info:
                     # Smells like xml



More information about the CMF-checkins mailing list