Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #2026: remove workaround for Lotus Notes #2691

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Issue #2026: remove workaround for Lotus Notes #2691

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions Kernel/System/Email.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,19 @@

package Kernel::System::Email;

use v5.24;
use strict;
use warnings;

# core modules

# CPAN modules
use Mail::Address;
use MIME::Entity;
use MIME::Parser;
use MIME::Words;

# OTOBO modules
use Kernel::System::VariableCheck qw(:all);

our @ObjectDependencies = (
Expand Down Expand Up @@ -59,8 +64,7 @@ sub new {
my ( $Type, %Param ) = @_;

# allocate new hash for object
my $Self = {%Param};
bless( $Self, $Type );
my $Self = bless {%Param}, $Type;

# debug level
$Self->{Debug} = $Param{Debug} || 0;
Expand Down Expand Up @@ -300,11 +304,6 @@ sub Send {
$Param{From} = $ConfigObject->Get('AdminEmail') || 'otobo@localhost';
}

# Replace all <br/> tags with <br /> tags (with a space) to show newlines in Lotus Notes.
if ( $Param{MimeType} && lc $Param{MimeType} eq 'text/html' ) {
$Param{Body} =~ s{\Q<br/>\E}{<br />}xmsgi;
}

# Map ReplyTo into Reply-To if present.
if ( $Param{ReplyTo} ) {
$Param{'Reply-To'} = $Param{ReplyTo};
Expand Down
Loading