merging 5.4.2 changes
This commit is contained in:
parent
a4d391b52a
commit
0726e2fd62
9 changed files with 2608 additions and 57 deletions
|
|
@ -225,7 +225,11 @@ If set to "1" then the listing will not include expired groupings. Defaults to "
|
|||
|
||||
sub getGroupsForUser {
|
||||
my $clause = "and expireDate>".time() if ($_[1]);
|
||||
return WebGUI::SQL->buildArrayRef("select groupId from groupings where userId=$_[0] $clause");
|
||||
if ($_[0] eq "") {
|
||||
return [];
|
||||
} else {
|
||||
return WebGUI::SQL->buildArrayRef("select groupId from groupings where userId=$_[0] $clause");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue