From fd4b75b2b2f54b79d63381c32a065ed4cfe4569b Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 28 May 2012 14:28:01 -0700
Subject: [PATCH] Make sure that the session actually contains a slave
 connection before trying to use it.  Fixes bug #12305

---
 docs/changelog/7.x.x.txt | 1 +
 lib/WebGUI/Session.pm    | 6 ++----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 5445a2186..5c953e4f0 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -16,6 +16,7 @@
  - fixed #12353: Dataform List mode
  - fixed #12364: Site export loses session info
  - fixed #12345: tickets in trash still show up
+ - fixed #12305: dbSlave breaks WebGUI when not able to connect
 
 7.10.24
  - fixed #12318: asset error causes asset manager to fail
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 7a4303a04..b2e2ec2cb 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -232,12 +232,10 @@ sub dbSlave {
             $self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass});
         }
 	}
-    if (!exists $self->{_slave}) {
-        return $self->db;
-    }
-    else {
+    if (exists $self->{_slave} && $self->{_slave}) {
         return $self->{_slave};
     }
+    return $self->db;
 }