diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-09 22:32:26 -0700 |
| commit | 026dc7ad72ba972f230b6709e31fa64397d75ad4 (patch) | |
| tree | c5af1a7ac9154744afc3660e9a9405892f2bb50b /rt/lib/RT/Util.pm | |
| parent | 07b4bc84d1078f7390221d766cdb3142513db4b0 (diff) | |
| parent | 1c538bfabc2cd31f27067505f0c3d1a46cba6ef0 (diff) | |
merge RT 4.2.11 and Header changes to disable RT javascript, RT#34237
Diffstat (limited to 'rt/lib/RT/Util.pm')
| -rw-r--r-- | rt/lib/RT/Util.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rt/lib/RT/Util.pm b/rt/lib/RT/Util.pm index bd3a22803..aa02b04d9 100644 --- a/rt/lib/RT/Util.pm +++ b/rt/lib/RT/Util.pm @@ -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]; } |