X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FMIME.pm;h=f114c680ba1a5b1d42639f71ce726d5a83b41a6d;hb=1a1fa6f0af2be9d4076d9aad5f5a84c5fb3d9a8a;hp=f2868a97fc565a643a83f4096304b6f3aed855c5;hpb=52d88842ad08288c8921d61c9d92f1de9265592c;p=debbugs.git

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index f2868a9..f114c68 100644
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -32,7 +32,7 @@ None known.
 use warnings;
 use strict;
 
-use base qw(Exporter);
+use Exporter qw(import);
 use vars qw($DEBUG $VERSION @EXPORT_OK %EXPORT_TAGS @EXPORT);
 
 BEGIN {
@@ -193,7 +193,7 @@ sub create_mime_message{
      die "The third argument to create_mime_message must be an arrayref" unless ref($attachments) eq 'ARRAY';
 
      if ($include_date) {
-	 my %headers = apply {lc($_)} @{$headers};
+	 my %headers = apply {defined $_ ? lc($_) : ''} @{$headers};
 	 if (not exists $headers{date}) {
 	     push @{$headers},
 		 ('Date',
@@ -206,7 +206,7 @@ sub create_mime_message{
      # MIME::Entity is stupid, and doesn't rfc1522 encode its headers, so we do it for it.
      my $msg = MIME::Entity->build('Content-Type' => 'text/plain; charset=utf-8',
 				   'Encoding'     => 'quoted-printable',
-				   (map{encode_rfc1522(encode_utf8($_))} @{$headers}),
+				   (map{encode_rfc1522(encode_utf8(defined $_ ? $_:''))} @{$headers}),
 				   Data    => encode_utf8($body),
 				  );