Author: tmckay
Date: 2011-10-12 13:18:24 +0000 (Wed, 12 Oct 2011)
New Revision: 5056
Modified:
branches/lucidity/wooly/python/wooly/pages.py
Log:
Merge 5055 from trunk
svn merge -c 5055
svn+ssh://svn.fedorahosted.org/svn/cumin/trunk .
BZ744793
Modified: branches/lucidity/wooly/python/wooly/pages.py
===================================================================
--- branches/lucidity/wooly/python/wooly/pages.py 2011-10-10 18:11:31 UTC (rev 5055)
+++ branches/lucidity/wooly/python/wooly/pages.py 2011-10-12 13:18:24 UTC (rev 5056)
@@ -109,7 +109,9 @@
def get_content_type(self, session):
value = session.request_environment.get("HTTP_USER_AGENT")
- if value and value.find("MSIE 6") != -1:
+ if (value and value.find("MSIE 6") != -1) or (value and
value.find("MSIE 9") != -1):
+ # sadly, although msie 9 handles application/xhtml+xml, the version of
swfobject (2.2)
+ # that we are using does not support that content type (by their design), so
we fall back to text/html
content_type = self.html_content_type
else:
content_type = self.xhtml_content_type