diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-31 11:45:29 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-31 11:45:29 +0200 |
| commit | 9cae99134580eacc95d445b43f2ea3a388bdd87a (patch) | |
| tree | 12ee77fe56c31b31b919f08d358093bbf020889f /addons/web/controllers | |
| parent | be77cf7f5fcb1f8cc080b8213b8474e1a6b75fd4 (diff) | |
| parent | 1e64a88cd3d6e914e8ed9accc9b2496fa55d93d7 (diff) | |
[MERGE] forward port branch 10.0 up to 1e64a88cd3d
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 035221014a1..5dbed1ab726 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1000,8 +1000,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: |