ignore '*' as encoding

4be9a02f · Andreas Jung · f74304d2 · 4be9a02f
Commit 4be9a02f authored Jan 08, 2007 by Andreas Jung
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

lib/python/Products/PageTemplates/unicodeconflictresolver.py lib/python/Products/PageTemplates/unicodeconflictresolver.py +2 -0

No files found.
--- a/lib/python/Products/PageTemplates/unicodeconflictresolver.py
+++ b/lib/python/Products/PageTemplates/unicodeconflictresolver.py
@@ -80,6 +80,8 @@ class PreferredCharsetResolver:
            request.__zpt_available_charsets = charsets

        for enc in charsets:
+            if enc == '*': continue
+
            try:
                return unicode(text, enc)
            except UnicodeDecodeError: