From 9ce482da3960ee43decee41fba53b78c12c3e52c Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Sat, 24 Sep 2016 10:28:06 -0700 Subject: rt 4.2.13 ticket#13852 --- rt/lib/RT/Test.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rt/lib/RT/Test.pm') diff --git a/rt/lib/RT/Test.pm b/rt/lib/RT/Test.pm index 6afb31192..257eea5b7 100644 --- a/rt/lib/RT/Test.pm +++ b/rt/lib/RT/Test.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2016 Best Practical Solutions, LLC # # # (Except where explicitly superseded by other copyright notices) @@ -886,7 +886,7 @@ sub create_ticket { $args{'MIMEObj'} = MIME::Entity->build( From => Encode::encode( "UTF-8", $args{'Requestor'} ), Subject => RT::Interface::Email::EncodeToMIME( String => $args{'Subject'} ), - Type => $args{ContentType} // "text/plain", + Type => (defined $args{ContentType} ? $args{ContentType} : "text/plain"), Charset => "UTF-8", Data => Encode::encode( "UTF-8", $content ), ); @@ -1718,9 +1718,9 @@ sub file_content { } sub find_executable { - my $self = shift; + my ( $self, $exe ) = @_; - return File::Which::which( @_ ); + return File::Which::which( $exe ); } sub diag { -- cgit v1.2.1