From 5304f835fefb42f2869b0a6e977fd5ffa64c2d13 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= <LpSolit@gmail.com>
Date: Tue, 24 May 2011 08:48:33 +0200
Subject: [PATCH] Bug 659185: html_quote() escapes @ causing mailto links to
 not be processed r/a=mkanat

---
 Bugzilla/Template.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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
-- 
2.47.2