remove UTF8 warnings

[debbugs.git] / Debbugs / MIME.pm

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index f2868a97fc565a643a83f4096304b6f3aed855c5..f114c680ba1a5b1d42639f71ce726d5a83b41a6d 100644 (file)
--- 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),
                                  );