- Fix some broken ZMI pages due to the changed default content type (#…

…1079)

CHANGES.rst

@@ -10,6 +10,10 @@ https://zope.readthedocs.io/en/2.13/CHANGES.html
 4.8.5 (unreleased)
 ------------------
 
+- Fix some broken ZMI pages due to the changed default content type
+  from PR https://github.com/zopefoundation/Zope/pull/1075
+  (`#1078 <https://github.com/zopefoundation/Zope/issues/1078>`_)
+
 - Update dependencies to the latest releases for each supported Python version.
 
 

src/App/special_dtml.py

@@ -206,6 +206,15 @@ def _exec(self, bound_data, args, kw):
 
         security = getSecurityManager()
         security.addContext(self)
+
+        # Set a content type to override the publisher default "text/plain"
+        # This class is only used in the Zope ZMI so it's safe to assume
+        # that it is rendering HTML.
+        if 'REQUEST' in bound_data:
+            response = bound_data['REQUEST'].RESPONSE
+            if not response.getHeader('Content-Type'):
+                response.setHeader('Content-Type', 'text/html')
+
         try:
             value = self.ZDocumentTemplate_beforeRender(ns, _marker)
             if value is _marker:

src/App/tests/testManagement.py

@@ -69,3 +69,28 @@ def test_Tabs_tabs_path_length(self):
         self.app.REQUEST.traverse(path)
 
         self.assertEqual(self.folder.tabs_path_length(self.app.REQUEST), 2)
+
+    def test_Tabs_content_type(self):
+        req = self.app.REQUEST
+
+        self.folder.manage_tabs(req)
+        self.assertIn('text/html', req.RESPONSE.getHeader('Content-Type'))
+
+
+class TestManagePages(Testing.ZopeTestCase.ZopeTestCase):
+
+    def setUp(self):
+        super().setUp()
+        uf = self.folder.acl_users
+        uf.userFolderAddUser('mgr', 'foo', ['Manager'], [])
+        self.login('mgr')
+
+    def tearDown(self):
+        self.logout()
+        super().tearDown()
+
+    def test_manage_content_type(self):
+        req = self.app.REQUEST
+
+        self.folder.manage(req)
+        self.assertIn('text/html', req.RESPONSE.getHeader('Content-Type'))