diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-31 14:53:06 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-31 14:53:06 +0200 |
| commit | f46a393602017602e755d7a2c1d1a050629637a5 (patch) | |
| tree | ecdcf630216ddf64b471883794236d79503b2328 /addons/web/controllers | |
| parent | 4d5ff6401cabd5a1c86cb15ec9189c8c29620439 (diff) | |
| parent | 09d698d05fa338e8c71e62a43c092b561f670fc0 (diff) | |
[MERGE] forward port branch saas-16 up to 09d698d05fa
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 b06b654aefc..fd2d596a4b2 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1016,8 +1016,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: |