Make sure that the session actually contains a slave connection before trying to use it. Fixes bug #12305

perlDreamer · perlDreamer · commit fd4b75b2b2f5 · 2012-05-28T14:28:01.000-07:00
diff --git 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
@@ -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;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -232,12 +232,10 @@ sub dbSlave {`
`232`	`232`	`$self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass});`
`233`	`233`	`}`
`234`	`234`	`}`
`235`		`- if (!exists $self->{_slave}) {`
`236`		`- return $self->db;`
`237`		`- }`
`238`		`- else {`
	`235`	`+ if (exists $self->{_slave} && $self->{_slave}) {`
`239`	`236`	`return $self->{_slave};`
`240`	`237`	`}`
	`238`	`+ return $self->db;`
`241`	`239`	`}`
`242`	`240`
`243`	`241`