summaryrefslogtreecommitdiff
path: root/rt/lib/RT/Test.pm
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2016-09-24 10:28:06 -0700
committerIvan Kohler <ivan@freeside.biz>2016-09-24 10:28:06 -0700
commit7322f2afedcc2f427e997d1535a503613a83f088 (patch)
tree6c0d4e68906bfdaaff2a2067620e222611b979ea /rt/lib/RT/Test.pm
parentae14e320388fa5e7f400bff1c251ef885b7952e6 (diff)
rt 4.2.13 ticket#13852
Diffstat (limited to 'rt/lib/RT/Test.pm')
-rw-r--r--rt/lib/RT/Test.pm8
1 files changed, 4 insertions, 4 deletions
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
# <sales@bestpractical.com>
#
# (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 {