diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-06-14 21:28:39 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-06-14 21:28:39 +0200 |
| commit | b05e4d5f958892a9ff644b28a4ee165aeb2ea247 (patch) | |
| tree | 49c4237e12ae99f3f78e4b496b27dae4455db800 /addons/website/models | |
| parent | 5ac40752a4845340c4bd582075caaf0dd478d639 (diff) | |
| parent | a53bea49fe4005e3faaa3e63888da65a45281dd5 (diff) | |
[MERGE] forward port branch saas-15 up to a53bea49fe4
Diffstat (limited to 'addons/website/models')
| -rw-r--r-- | addons/website/models/ir_http.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/addons/website/models/ir_http.py b/addons/website/models/ir_http.py index 0e5443ad79e..aa703071d9b 100644 --- a/addons/website/models/ir_http.py +++ b/addons/website/models/ir_http.py @@ -6,6 +6,7 @@ import traceback import os import unittest +import pytz import werkzeug import werkzeug.routing import werkzeug.utils @@ -74,6 +75,10 @@ class Http(models.AbstractModel): context = {} if not request.context.get('tz'): context['tz'] = request.session.get('geoip', {}).get('time_zone') + try: + pytz.timezone(context['tz'] or '') + except pytz.UnknownTimeZoneError: + context.pop('tz') request.website = request.env['website'].get_current_website() # can use `request.env` since auth methods are called context['website_id'] = request.website.id |