From 0b52e8a887f41f162fe6593fac264f44042cfbbd Mon Sep 17 00:00:00 2001
From: Goffin Simon <sig@odoo.com>
Date: Tue, 24 Nov 2015 10:56:48 +0100
Subject: [PATCH] [FIX] tools: html_keep_url

If an url is the label of a tag a, the htm_keep_url doesn't have
to treat this url.

opw:656821
---
 openerp/tools/mail.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openerp/tools/mail.py b/openerp/tools/mail.py
index 32f3af766f9..9b02076627e 100644
--- a/openerp/tools/mail.py
+++ b/openerp/tools/mail.py
@@ -466,7 +466,7 @@ def html_keep_url(text):
     """ Transform the url into clickable link with <a/> tag """
     idx = 0
     final = ''
-    link_tags = re.compile(r"""(?<!["'])((ftp|http|https):\/\/(\w+:{0,1}\w*@)?([^\s"':]+)(:[0-9]+)?(\/|\/([^\s"']))?)(?![^\s"']*["'])""")
+    link_tags = re.compile(r"""(?<!["'])((ftp|http|https):\/\/(\w+:{0,1}\w*@)?([^\s<"':]+)(:[0-9]+)?(\/|\/([^\s<"']))?)(?![^\s<"']*["']|[^\s<"']*</a>)""")
     for item in re.finditer(link_tags, text):
         final += text[idx:item.start()]
         final += '<a href="%s" target="_blank">%s</a>' % (item.group(0), item.group(0))