Skip to content

Z
Zope
Commit 334d5902 authored by Hanno Schlichting's avatar Hanno Schlichting
Browse files
Options

Merged r106105:106106 from 2.12 branch

parent ac7b3965
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
src/App/dtml/manage_page_header.dtml
View file @ 334d5902
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<dtml-unless management_page_charset> <dtml-unless management_page_charset>
<dtml-call "REQUEST.set('management_page_charset','iso-8859-1')"> <dtml-call "REQUEST.set('management_page_charset','utf-8')">
</dtml-unless> </dtml-unless>
<meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;" /> <meta http-equiv="content-type" content="text/html;charset=&dtml-management_page_charset;" />
<dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)"> <dtml-call "RESPONSE.setHeader('content-type','text/html;charset='+management_page_charset)">
......
src/Products/PageTemplates/tests/testZopePageTemplate.py
View file @ 334d5902
...@@ -337,7 +337,7 @@ class ZopePageTemplateFileTests(ZopeTestCase): ...@@ -337,7 +337,7 @@ class ZopePageTemplateFileTests(ZopeTestCase):
zpt = self._put(html_with_upper_attr) zpt = self._put(html_with_upper_attr)
self.content_type = 'text/html' self.content_type = 'text/html'
result = zpt.pt_render() result = zpt.pt_render()
self.assertEqual('ATTR' in result, False) self.assertEqual('ATTR' in result, False)
class PreferredCharsetUnicodeResolverTests(unittest.TestCase): class PreferredCharsetUnicodeResolverTests(unittest.TestCase):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7