diff options
| author | Olivier Dony <odo@openerp.com> | 2014-06-12 18:59:15 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2014-06-12 18:59:15 +0200 |
| commit | 0f01df42eaf662987abe5f069ca8df2e2caf8e37 (patch) | |
| tree | 3cbe73598a919d0c037f68d991d5366afb496783 /addons/website/models/ir_qweb.py | |
| parent | 114e95b113ee30f8edb965b938739948496f2168 (diff) | |
| parent | f15cbd652035d513b4dfb412025f5997323d3229 (diff) | |
[MERGE] Forward-port saas-5 up to f15cbd6
Diffstat (limited to 'addons/website/models/ir_qweb.py')
| -rw-r--r-- | addons/website/models/ir_qweb.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index 0e1fe2beb89..6c466355d07 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -25,6 +25,7 @@ import openerp.modules import openerp from openerp.osv import orm, fields from openerp.tools import ustr, DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools import html_escape as escape from openerp.addons.web.http import request from openerp.addons.base.ir import ir_qweb @@ -276,7 +277,7 @@ class Image(orm.AbstractModel): url_params[options_key] = options[options_key] return ir_qweb.HTMLSafe('<img class="%s" src="/website/image?%s"/>' % ( - ' '.join(itertools.imap(werkzeug.utils.escape, classes)), + ' '.join(itertools.imap(escape, classes)), werkzeug.urls.url_encode(url_params) )) |