[MERGE] Forward-port of latest saas-3 bugfixes, up to rev. a096ae0080bc6555a8b832e87d...

[odoo/odoo.git] / addons / website / models / ir_http.py

diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py
index 91b998c..62b6fa3 100644 (file)
--- a/addons/website/models/ir_http.py
+++ b/addons/website/models/ir_http.py
@@ -126,6 +126,7 @@ class ir_http(orm.AbstractModel):
             return response
 
     def _handle_exception(self, exception=None, code=500):
+        res = super(ir_http, self)._handle_exception(exception)
         if isinstance(exception, werkzeug.exceptions.HTTPException) and hasattr(exception, 'response') and exception.response:
             return exception.response
 
@@ -168,7 +169,7 @@ class ir_http(orm.AbstractModel):
                 html = request.website._render('website.http_error', values)
             return werkzeug.wrappers.Response(html, status=code, content_type='text/html;charset=utf-8')
 
-        return super(ir_http, self)._handle_exception(exception)
+        return res
 
 class ModelConverter(ir.ir_http.ModelConverter):
     def __init__(self, url_map, model=False, domain='[]'):