From b64bd885b00bc6ef9956af330888a77fccda7fbb Mon Sep 17 00:00:00 2001 From: Christophe Combelles Date: Thu, 10 Jul 2014 17:47:06 +0300 Subject: [PATCH] [FIX] base: ir.qweb: ensure element.tail is correctly encoded element.{text,tail} are either ascii-compatible `str`, or `unicode` when non-ascii-compatible. This could force the implicit decoding of utf-8 encoded contents when joining template bits, breaking the rendering. Fixes #1085, and related to #1130 --- openerp/addons/base/ir/ir_qweb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py index 741f8d45b84..48d9c24e521 100644 --- a/openerp/addons/base/ir/ir_qweb.py +++ b/openerp/addons/base/ir/ir_qweb.py @@ -289,7 +289,7 @@ class QWeb(orm.AbstractModel): result = self.render_element(element, template_attributes, generated_attributes, qwebcontext) if element.tail: - result += element.tail + result += element.tail.encode('utf-8') if isinstance(result, unicode): return result.encode('utf-8')