diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-09-21 16:01:58 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-09-21 16:01:58 +0200 |
| commit | a3648fd23a21efe3d2d507fb926b7f7cc55c1bba (patch) | |
| tree | ef5f6ae4fb1080319fada8e5b31571ae7b8e4c05 /addons/web/controllers | |
| parent | 9975a04e4d81f718b13fef41b798d82d709a718b (diff) | |
| parent | aabbdc7339b9c2e1c10824ca2fc0a86419c46685 (diff) | |
[MERGE] forward port of branch 8.0 up to aabbdc7
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 690e977e9f6..47851d40c25 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -452,8 +452,8 @@ def content_disposition(filename): version = int((request.httprequest.user_agent.version or '0').split('.')[0]) if browser == 'msie' and version < 9: return "attachment; filename=%s" % escaped - elif browser == 'safari': - return u"attachment; filename=%s" % filename + elif browser == 'safari' and version < 537: + return u"attachment; filename=%s" % filename.encode('ascii', 'replace') else: return "attachment; filename*=UTF-8''%s" % escaped |