summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js
diff options
context:
space:
mode:
authorqdp-odoo <qdp@odoo.com>2016-12-30 17:20:36 +0100
committerqdp-odoo <qdp@odoo.com>2016-12-30 17:21:25 +0100
commit4f29b77e3d1677ffc88336cc99fb7f09d49d7dd1 (patch)
tree0642a57228cc2e0e3ab04d5afbfb5adf882b689c /addons/mail/static/src/js
parent33a413eb2944db4a35d035f42161159ae53dd830 (diff)
[MERGE] foward port of 10.0 up to revision 84a650e33aadb29661121410813e3de37a5ad3e9
Diffstat (limited to 'addons/mail/static/src/js')
-rw-r--r--addons/mail/static/src/js/chat_manager.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/chat_manager.js b/addons/mail/static/src/js/chat_manager.js
index c002b53e3f1..146196af6c9 100644
--- a/addons/mail/static/src/js/chat_manager.js
+++ b/addons/mail/static/src/js/chat_manager.js
@@ -668,7 +668,7 @@ var chat_manager = {
// to linkify the urls we end up with double linkification a bit everywhere.
// Ideally we want to keep the content as text internally and only make html
// enrichment at display time but the current design makes this quite hard to do.
- var body = utils.linkify(_.str.trim(data.content));
+ var body = utils.parse_and_transform(_.str.trim(data.content), utils.add_link);
var msg = {
partner_ids: data.partner_ids,