depend on libmagic, gravatar-url and www-perl

[debbugs.git] / Debbugs / Mail.pm

diff --git a/Debbugs/Mail.pm b/Debbugs/Mail.pm
index a2a27d237ae819937fbf187964c4939d33f45096..01ae327798fd41e7f8c2e7125615b3c6ce456338 100644 (file)
--- a/Debbugs/Mail.pm
+++ b/Debbugs/Mail.pm
@@ -39,7 +39,7 @@ END
 use warnings;
 use strict;
 use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
-use base qw(Exporter);
+use Exporter qw(import);
 
 use IPC::Open3;
 use POSIX qw(:sys_wait_h strftime);
@@ -435,8 +435,10 @@ sub reply_headers{
     $r_l{subject} = 'Re: '. $r_l{subject} unless $r_l{subject} =~ /(?:^|\s)Re:\s+/;
     $r_l{subject} =~ s/(?:^\s*|\s*$)//g;
     $r_l{'In-Reply-To'} = $head->get('Message-Id');
+    $r_l{'In-Reply-To'} =~ s/(?:^\s*|\s*$)//g if defined $r_l{'In-Reply-To'};
     delete $r_l{'In-Reply-To'} unless defined $r_l{'In-Reply-To'};
     $r_l{References} = ($head->get('References')//''). ' '.($head->get('Message-Id')//'');
+    $r_l{References} =~ s/(?:^\s*|\s*$)//g;
     my $date = $head->get('Date') // 'some date';
     $date =~ s/(?:^\s*|\s*$)//g;
     my $who = $head->get('From') // $head->get('Reply-To') // 'someone';
@@ -457,7 +459,6 @@ sub reply_headers{
             }
             if (defined $part->bodyhandle and
                 $part->effective_type =~ /text/) {
-                print STDERR $part->effective_type."\n";
                 $b_h = $part->bodyhandle;
                 last;
             }