Merged r106105:106106 from 2.12 branch

334d5902 · Hanno Schlichting · ac7b3965 · 334d5902 · 334d5902
Commit 334d5902 authored Nov 29, 2009 by Hanno Schlichting
Showing with 2 additions and 2 deletions

src/App/dtml/manage_page_header.dtml src/App/dtml/manage_page_header.dtml +1 -1

src/Products/PageTemplates/tests/testZopePageTemplate.py src/Products/PageTemplates/tests/testZopePageTemplate.py +1 -1

No files found.
--- a/src/App/dtml/manage_page_header.dtml
+++ b/src/App/dtml/manage_page_header.dtml
@@ -2,7 +2,7 @@
 <html>
 <head>
 <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>
 <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)">

--- a/src/Products/PageTemplates/tests/testZopePageTemplate.py
+++ b/src/Products/PageTemplates/tests/testZopePageTemplate.py
@@ -337,7 +337,7 @@ class ZopePageTemplateFileTests(ZopeTestCase):
        zpt = self._put(html_with_upper_attr)
        self.content_type = 'text/html'
        result = zpt.pt_render()
-     	self.assertEqual('ATTR' in result, False)		
+        self.assertEqual('ATTR' in result, False)

 class PreferredCharsetUnicodeResolverTests(unittest.TestCase):