diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-07-04 13:17:16 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-07-04 13:17:16 +0200 |
| commit | 97258040d80f3435b6d461de35f86a615ee2b106 (patch) | |
| tree | e5744725ebaee515b81a7823f58ba2973dbfc874 /addons/web/controllers | |
| parent | d89761c19acdc294c97fcbab3ae9caf53998c70b (diff) | |
| parent | 657e3289032d8ce6466019a36f7abf1be49df5cc (diff) | |
[MERGE] forward port branch 10.0 up to 657e3289032
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 11d3801c803..035221014a1 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1000,6 +1000,8 @@ class Binary(http.Controller): elif status != 200 and download: return request.not_found() + height = int(height) + width = int(width) if content and (width or height): # resize maximum 500*500 if width > 500: |
