- Fix broken ZMI DTML rendering for mixed unicode/bytes content (fixes …

…#271)
zopefoundation · Apr 25, 2019 · 671c687 · 671c687
1 parent ee16cae
commit 671c687
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -14,6 +14,9 @@ https://github.com/zopefoundation/Zope/blob/4.0a6/CHANGES.rst
 Fixes
 +++++
 
+- Fix broken ZMI DTML rendering for mixed unicode/bytes content
+  (`#271 <https://github.com/zopefoundation/Zope/issues/271>`_)
+
 - Fix wrong `Content-Length` set by ``App.ImageFile`` on 304 responses
   (`#513 <https://github.com/zopefoundation/Zope/issues/513>`_)
 

diff --git a/src/App/special_dtml.py b/src/App/special_dtml.py
@@ -208,7 +208,8 @@ def _exec(self, bound_data, args, kw):
             value = self.ZDocumentTemplate_beforeRender(ns, _marker)
             if value is _marker:
                 try:
-                    result = render_blocks(self._v_blocks, ns)
+                    result = render_blocks(self._v_blocks, ns,
+                                           encoding=self.encoding)
                 except DTReturn as v:
                     result = v.v