[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-127-g7ee3ab7

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  7ee3ab7c80f7552663c7e149607a56d4c7e4fe74 (commit)
      from  9d44bd0bac5b60a25034b704a6715e0e37c5af42 (commit)

Summary of changes:
 lib/RT/Interface/Web.pm  |    2 +-
 share/html/Elements/Logo |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 7ee3ab7c80f7552663c7e149607a56d4c7e4fe74
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Wed Oct 6 18:50:31 2010 -0400

    During Install Mode, $RT::Handle and $RT::System aren't always defined

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index a9983e4..c50c1a7 100755
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -165,7 +165,7 @@ sub HandleRequest {
     $HTML::Mason::Commands::m->{'rt_base_time'} = [ Time::HiRes::gettimeofday() ];
 
     # Roll back any dangling transactions from a previous failed connection
-    $RT::Handle->ForceRollback() if $RT::Handle->TransactionDepth;
+    $RT::Handle->ForceRollback() if $RT::Handle and $RT::Handle->TransactionDepth;
 
     MaybeEnableSQLStatementLog();
 
diff --git a/share/html/Elements/Logo b/share/html/Elements/Logo
index b37945f..a9231e2 100644
--- a/share/html/Elements/Logo
+++ b/share/html/Elements/Logo
@@ -67,7 +67,8 @@ if ( exists $ARGS{'show_name'} ) {
     $ShowName = delete $ARGS{'show_name'};
 }
 
-my $use_user_logo = $RT::System->FirstAttribute('UserLogo');
+use Scalar::Util qw(blessed);
+my $use_user_logo = blessed $RT::System ? $RT::System->FirstAttribute('UserLogo') : 0;
 
 </%INIT>
 <%ARGS>

-----------------------------------------------------------------------