small fixes according review

ckan · Jun 13, 2018 · 3ad4ddd · 3ad4ddd
1 parent 9b7b521
commit 3ad4ddd
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ckan/config/middleware/flask_app.py b/ckan/config/middleware/flask_app.py
@@ -410,9 +410,10 @@ def error_handler(e):
         if isinstance(e, HTTPException):
             extra_vars = {u'code': [e.code], u'content': e.description}
             return base.render(u'error_document_template.html', extra_vars), e.code
-        extra_vars = {u'code': 500, u'content': e.message}
+        extra_vars = {u'code': [500], u'content': u'Internal server error'}
         return base.render(u'error_document_template.html', extra_vars), 500
 
     for code in default_exceptions:
         app.register_error_handler(code, error_handler)
-    app.register_error_handler(Exception, error_handler)
+    if not app.debug:
+        app.register_error_handler(Exception, error_handler)