oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Colin Kuskie 2012-05-28 14:28:01 -07:00
parent 45d7c5505f
commit fd4b75b2b2
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/changelog/7.x.x.txt
View file

@ -16,6 +16,7 @@
- fixed #12353: Dataform List mode - fixed #12353: Dataform List mode
- fixed #12364: Site export loses session info - fixed #12364: Site export loses session info
- fixed #12345: tickets in trash still show up - fixed #12345: tickets in trash still show up
- fixed #12305: dbSlave breaks WebGUI when not able to connect
7.10.24 7.10.24
- fixed #12318: asset error causes asset manager to fail - fixed #12318: asset error causes asset manager to fail

6
lib/WebGUI/Session.pm
View file

@ -232,12 +232,10 @@ sub dbSlave {
$self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass}); $self->{_slave} = WebGUI::SQL->connect($self, $slave->{dsn},$slave->{user},$slave->{pass});
} }
} }
if (!exists $self->{_slave}) { if (exists $self->{_slave} && $self->{_slave}) {
return $self->db;
}
else {
return $self->{_slave}; return $self->{_slave};
} }
return $self->db;
} }