use Debbugs::Config qw(:config);
use POSIX qw(strftime);
use Encode qw(decode_utf8 encode_utf8);
-use URI::Escape qw(uri_escape);
+use URI::Escape qw(uri_escape_utf8);
use Scalar::Util qw(blessed);
BEGIN{
# We don't html escape here because we escape above;
# wierd terminators are because of that
$body =~ s{((?:ftp|http|https|svn|ftps|rsync)://[\S~-]+?/?) # Url
- ((?:\>\;)?[)]?(?:'|\&\#39\;)?[:.\,]?(?:\s|$)) # terminators
+ ((?:\>\;)?[)]?(?:'|\&\#39\;|\"\;)?[:.\,]?(?:\s|$)) # terminators
}{<a href=\"$1\">$1</a>$2}gox;
# Add links to bug closures
$body =~ s[((?:closes|see):\s* # start of closed/referenced bugs
my $r_l = reply_headers($entity);
$output .= q(<a href=").
html_escape('mailto:'.$bug_number.'@'.$config{email_domain}.'?'.
- join('&',map {defined $r_l->{$_}?$_.'='.uri_escape($r_l->{$_}):()} keys %{$r_l})).
+ join('&',map {defined $r_l->{$_}?$_.'='.uri_escape_utf8($r_l->{$_}):()} keys %{$r_l})).
qq(">reply</a>);
$output .= ')'.":</p>\n";
if (not defined $config{libravatar_uri} or not length $config{libravatar_uri}) {
return undef;
}
- ($email) = get_addresses($email);
- return $config{libravatar_uri}.uri_escape($email.($config{libravatar_uri_options}//''));
+ ($email) = grep {/\@/} get_addresses($email);
+ return $config{libravatar_uri}.uri_escape_utf8($email.($config{libravatar_uri_options}//''));
}