diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-03-24 14:38:11 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-03-24 14:38:11 +0100 |
| commit | d93b79e6f4e5c6c2fda65fbf88df8e1851b6fa4d (patch) | |
| tree | f855bc221056bf09cd4713d6cd44ab6b1449a268 /addons/mail/static/src/js | |
| parent | 7c4557add24726f34fec3aa834c34fa5c9b1f17f (diff) | |
| parent | f4b1d23cf2b44521456b479c1038e17d5ee0bac8 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index b8bf703f604..17dd4b57cd0 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -76,8 +76,8 @@ openerp.mail = function (session) { */ get_text2html: function (text) { return text - .replace(/[\n\r]/g,'<br/>') .replace(/((?:https?|ftp):\/\/[\S]+)/g,'<a href="$1">$1</a> ') + .replace(/[\n\r]/g,'<br/>') }, /* Returns the complete domain with "&" |