merging 7.1.3 changes
This commit is contained in:
parent
82bea1825c
commit
67dfefff08
4 changed files with 20 additions and 15 deletions
|
|
@ -588,15 +588,18 @@ sub getDatabaseUsers {
|
|||
my $query = $self->get("dbQuery");
|
||||
WebGUI::Macro::process($self->session,\$query);
|
||||
my $sth = $dbh->unconditionalRead($query);
|
||||
unless ($sth->errorCode < 1) {
|
||||
$self->session->errorHandler->warn("There was a problem with the database query for group ID $gid.");
|
||||
}
|
||||
else {
|
||||
while(my ($userId)=$sth->array) {
|
||||
push @dbUsers, $userId;
|
||||
if (defined $sth) {
|
||||
unless ($sth->errorCode < 1) {
|
||||
$self->session->errorHandler->warn("There was a problem with the database query for group ID $gid.");
|
||||
} else {
|
||||
while(my ($userId)=$sth->array) {
|
||||
push @dbUsers, $userId;
|
||||
}
|
||||
}
|
||||
$sth->finish;
|
||||
} else {
|
||||
$self->session->errorHandler->error("Couldn't process unconditional read for database group with group id $gid.");
|
||||
}
|
||||
$sth->finish;
|
||||
$dbLink->disconnect;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue