From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 24 May 2011 06:48:33 +0000 (+0200)
Subject: Bug 659185: html_quote() escapes @ causing mailto links to not be processed
X-Git-Tag: bugzilla-4.0.2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5304f835fefb42f2869b0a6e977fd5ffa64c2d13;p=thirdparty%2Fbugzilla.git

Bug 659185: html_quote() escapes @ causing mailto links to not be processed
r/a=mkanat
---

diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index a287b8ac95..f58128eec0 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -222,7 +222,8 @@ sub quoteUrls {
 
     # mailto:
     # Use |<nothing> so that $1 is defined regardless
-    $text =~ s~\b(mailto:|)?([\w\.\-\+\=]+\@[\w\-]+(?:\.[\w\-]+)+)\b
+    # &#64; is the encoded '@' character.
+    $text =~ s~\b(mailto:|)?([\w\.\-\+\=]+&\#64;[\w\-]+(?:\.[\w\-]+)+)\b
               ~<a href=\"mailto:$2\">$1$2</a>~igx;
 
     # attachment links