Skip to content
Permalink
Browse files

Make sure that the session actually contains a slave connection befor…

…e trying to use it. Fixes bug #12305
  • Loading branch information...
perlDreamer committed May 28, 2012
1 parent 45d7c55 commit fd4b75b2b2f54b79d63381c32a065ed4cfe4569b
Showing with 3 additions and 4 deletions.
  1. +1 −0 docs/changelog/7.x.x.txt
  2. +2 −4 lib/WebGUI/Session.pm
@@ -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
@@ -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;
}


0 comments on commit fd4b75b

Please sign in to comment.
You can’t perform that action at this time.