summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2011-05-24 08:46:43 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2011-05-24 08:46:43 +0200
commitdf2d2daab9a4c9e6675abbef2eadc6123b4d5e82 (patch)
tree0d46700671ed9707a7b052dc828c3a551c23d4d1
parentbd41885ba1270f92c6f15c0332febb5fed0cf54c (diff)
downloadbugzilla-df2d2daab9a4c9e6675abbef2eadc6123b4d5e82.tar.gz
bugzilla-df2d2daab9a4c9e6675abbef2eadc6123b4d5e82.tar.xz
Bug 659185: html_quote() escapes @ causing mailto links to not be processed
r/a=mkanat
-rw-r--r--Bugzilla/Template.pm3
1 files changed, 2 insertions, 1 deletions
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