summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-07-04 14:40:20 +0200
committerChristophe Simonis <chs@odoo.com>2017-07-04 14:40:20 +0200
commit10cb34bcacc0983cdab722e528d413a996df3a7b (patch)
tree749977ed99f5895080eac3d0fd842033eb276b7b /addons/web/controllers
parent81d0bfa4738c5563a26df5cd666ef895cd59d3d0 (diff)
parent97258040d80f3435b6d461de35f86a615ee2b106 (diff)
[MERGE] forward port branch saas-14 up to 97258040d80
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 85bd770bacc..54bb061ad06 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1003,6 +1003,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: