[#808] Fix unicode template 500 error

ckan · Apr 29, 2013 · 4fb36e6 · 4fb36e6
1 parent 8d4cbb9
commit 4fb36e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ckan/lib/base.py b/ckan/lib/base.py
@@ -134,8 +134,9 @@ def render_template():
             return render_jinja2(template_name, globs)
 
         # Genshi templates
-        template = globs['app_globals'].genshi_loader.load(template_name,
-                                                           cls=loader_class)
+        template = globs['app_globals'].genshi_loader.load(
+            template_name.encode('utf-8'), cls=loader_class
+        )
         stream = template.generate(**globs)
 
         for item in PluginImplementations(IGenshiStreamFilter):

diff --git a/ckan/lib/render.py b/ckan/lib/render.py
@@ -10,7 +10,7 @@ def find_template(template_name):
     returns the full path is it exists. '''
     template_paths = config['pylons.app_globals'].template_paths
     for path in template_paths:
-        if os.path.exists(os.path.join(path, template_name)):
+        if os.path.exists(os.path.join(path, template_name.encode('utf-8'))):
             return os.path.join(path, template_name)
 
 def template_type(template_path):