Stop URLs at " too. Thanks to Vincent Lefevre (Closes: #766354).

[debbugs.git] / Debbugs / CGI / Bugreport.pm

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index dc02b224c4c77b7757ab6324fd686bd0c92b2f50..00619fc47a70d99a0b1c50fc9575760a510e576c 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -271,7 +271,7 @@ sub display_entity {
         # 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
-                   ((?:\&gt\;)?[)]?(?:'|\&\#39\;)?[:.\,]?(?:\s|$)) # terminators
+                   ((?:\&gt\;)?[)]?(?:'|\&\#39\;|\&quot\;)?[:.\,]?(?:\s|$)) # terminators
              }{<a href=\"$1\">$1</a>$2}gox;
         # Add links to bug closures
         $body =~ s[((?:closes|see):\s* # start of closed/referenced bugs
@@ -474,7 +474,7 @@ sub __libravatar_url {
     if (not defined $config{libravatar_uri} or not length $config{libravatar_uri}) {
         return undef;
     }
-    ($email) = get_addresses($email);
+    ($email) = grep {/\@/} get_addresses($email);
     return $config{libravatar_uri}.uri_escape_utf8($email.($config{libravatar_uri_options}//''));
 }