[#808] Fix Unicode url from causing a 500 now returns 404 as expected

ckan · Apr 24, 2013 · 290e594 · 290e594
1 parent 8d51a5a
commit 290e594
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/ckan/controllers/template.py b/ckan/controllers/template.py
@@ -29,11 +29,11 @@ def view(self, url):
         """
         try:
             return base.render(url)
-        except TemplateNotFound:
+        except (TemplateNotFound, UnicodeEncodeError):
             if url.endswith('.html'):
                 base.abort(404)
             url += '.html'
             try:
                 return base.render(url)
-            except TemplateNotFound:
+            except (TemplateNotFound, UnicodeEncodeError):
                 base.abort(404)