Merge branch 'master' into don/libravatar

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

diff --git a/Debbugs/CGI/Bugreport.pm b/Debbugs/CGI/Bugreport.pm
index c4bfdc517eb726bb8ab2703c8ce290ec28067008..2e53892ca5ced8e019b24b5bf291640a45556432 100644 (file)
--- a/Debbugs/CGI/Bugreport.pm
+++ b/Debbugs/CGI/Bugreport.pm
@@ -148,10 +148,10 @@ sub display_entity {
                    if ($_ eq 'From' and $param{avatars}) {
                        my $libravatar_url = __libravatar_url(decode_rfc1522($head_field));
                        if (defined $libravatar_url and length $libravatar_url) {
-                           push @headers,q(<img src=").$libravatar_url.qq(">\n);
+                           push @headers,q(<img src="http://).$libravatar_url.qq(" alt="">\n);
                        }
                    }
-                  push @headers, qq(<p><span class="header">$_:</span> ) . html_escape(decode_rfc1522($head_field))."</p>\n";
+                  push @headers, qq(<div class="header"><span class="headerfield">$_:</span> ) . html_escape(decode_rfc1522($head_field))."</div>\n";
              }
              print {$output} join(qq(), @headers);
         } else {
@@ -452,7 +452,7 @@ sub __libravatar_url {
         return undef;
     }
     ($email) = get_addresses($email);
-    return $config{libravatar_uri}.md5_hex(lc($email)).($config{libravatar_uri_options}//'');
+    return $config{libravatar_uri}.$email.($config{libravatar_uri_options}//'');
 }