View | Details | Raw Unified | Return to bug 29330
Collapse All | Expand All

(-)a/C4/Letters.pm (-4 / +5 lines)
Lines 40-45 use Koha::Patrons; Link Here
40
use Koha::SMTP::Servers;
40
use Koha::SMTP::Servers;
41
use Koha::Subscriptions;
41
use Koha::Subscriptions;
42
42
43
use constant SERIALIZED_EMAIL_CONTENT_TYPE => 'message/rfc822';
44
43
our (@ISA, @EXPORT_OK);
45
our (@ISA, @EXPORT_OK);
44
BEGIN {
46
BEGIN {
45
    require Exporter;
47
    require Exporter;
Lines 1230-1236 sub ResendMessage { Link Here
1230
  This routine picks the I<content> of I<letter> and generates a MIME
1232
  This routine picks the I<content> of I<letter> and generates a MIME
1231
  email, attaching the passed I<attachments> using Koha::Email. The
1233
  email, attaching the passed I<attachments> using Koha::Email. The
1232
  content is replaced by the string representation of the MIME object,
1234
  content is replaced by the string representation of the MIME object,
1233
  and the content-type is updated to B<MIME> for later handling.
1235
  and the content-type is updated for later handling.
1234
1236
1235
=cut
1237
=cut
1236
1238
Lines 1259-1265 sub _add_attachments { Link Here
1259
        );
1261
        );
1260
    }
1262
    }
1261
1263
1262
    $letter->{'content-type'} = 'MIME';
1264
    $letter->{'content-type'} = SERIALIZED_EMAIL_CONTENT_TYPE;
1263
    $letter->{content} = $message->as_string;
1265
    $letter->{content} = $message->as_string;
1264
1266
1265
    return $letter;
1267
    return $letter;
Lines 1409-1415 sub _send_message_by_email { Link Here
1409
            subject  => "" . $message->{subject}
1411
            subject  => "" . $message->{subject}
1410
        };
1412
        };
1411
1413
1412
        if ( $message->{'content_type'} && $message->{'content_type'} eq 'MIME' ) {
1414
        if ( $message->{'content_type'} && $message->{'content_type'} eq SERIALIZED_EMAIL_CONTENT_TYPE ) {
1413
1415
1414
            # The message has been previously composed as a valid MIME object
1416
            # The message has been previously composed as a valid MIME object
1415
            # and serialized as a string on the DB
1417
            # and serialized as a string on the DB
1416
- 

Return to bug 29330