Merge branch 'master' of git.freeside.biz:/home/git/freeside

1 files changed, 6 insertions, 6 deletions

diff --git a/rt/lib/RT/Util.pm b/rt/lib/RT/Util.pm
index f8ffccfb9..aa02b04d9 100644
--- a/rt/lib/RT/Util.pm
+++ b/rt/lib/RT/Util.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
@@ -66,11 +66,11 @@ sub safe_run_child (&) {
     # on failure and reset values only in our original
     # process
     my ($oldv_dbh, $oldv_rth);
-    my $dbh = $RT::Handle->dbh;
+    my $dbh = $RT::Handle ? $RT::Handle->dbh : undef;
     $oldv_dbh = $dbh->{'InactiveDestroy'} if $dbh;
     $dbh->{'InactiveDestroy'} = 1 if $dbh;
-    $oldv_rth = $RT::Handle->{'DisconnectHandleOnDestroy'};
-    $RT::Handle->{'DisconnectHandleOnDestroy'} = 0;
+    $oldv_rth = $RT::Handle->{'DisconnectHandleOnDestroy'} if $RT::Handle;
+    $RT::Handle->{'DisconnectHandleOnDestroy'} = 0 if $RT::Handle;
 
     my ($reader, $writer);
     pipe( $reader, $writer );
@@ -94,7 +94,7 @@ sub safe_run_child (&) {
         $err =~ s/^Stack:.*$//ms;
         if ( $our_pid == $$ ) {
             $dbh->{'InactiveDestroy'} = $oldv_dbh if $dbh;
-            $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth;
+            $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth if $RT::Handle;
             die "System Error: $err";
         } else {
             print $writer "System Error: $err";
@@ -108,7 +108,7 @@ sub safe_run_child (&) {
     warn $response if $response;
 
     $dbh->{'InactiveDestroy'} = $oldv_dbh if $dbh;
-    $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth;
+    $RT::Handle->{'DisconnectHandleOnDestroy'} = $oldv_rth if $RT::Handle;
     return $want? (@res) : $res[0];
 }