diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-31 14:09:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-31 14:09:34 +0200 |
| commit | 09d698d05fa338e8c71e62a43c092b561f670fc0 (patch) | |
| tree | 427766aa2a7dc3dc759aa96d675500a567d612dc /addons/web/controllers | |
| parent | a752e7d1458b1d689a028fcf89b582ae74333d49 (diff) | |
| parent | a6900c43b44edb52f5f998405198d1f95221d418 (diff) | |
[MERGE] forward port branch saas-15 up to a6900c43b44
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 5c3fc9f9e50..a34ff7f7bdf 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1012,8 +1012,8 @@ class Binary(http.Controller): elif status != 200 and download: return request.not_found() - height = int(height) - width = int(width) + height = int(height or 0) + width = int(width or 0) if content and (width or height): # resize maximum 500*500 if width > 500: |