From df2d2daab9a4c9e6675abbef2eadc6123b4d5e82 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Tue, 24 May 2011 08:46:43 +0200
Subject: 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 612291ceb..8a7f538bd 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -229,7 +229,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
-- 
cgit v1.2.3-24-g4f1b