[master,controller/template][xs]: support urls which do not have .htm…

…l in them (but template does) and only abort 404 on template not found as otherwise we can hide errors.

ckan/controllers/template.py

@@ -1,4 +1,5 @@
 from ckan.lib.base import *
+from genshi.template.loader import TemplateNotFound
 
 class TemplateController(BaseController):
 
@@ -26,5 +27,12 @@ def view(self, url):
         """
         try:
             return render(url)
-        except:
-            abort(404)
+        except TemplateNotFound:
+            if url.endswith('.html'):
+                abort(404)
+            url += '.html'
+            try:
+                return render(url)
+            except TemplateNotFound:
+                abort(404)
+