merging 7.1.4 changes

This commit is contained in:
JT Smith 2006-11-03 04:36:13 +00:00
parent 3d878c09c7
commit aeba6ec83c
18 changed files with 92 additions and 73 deletions

View file

@ -208,7 +208,10 @@ If set to "1" then the listing will not include expired groupings. Defaults to "
sub getGroups {
my $self = shift;
my $withoutExpired = shift;
my $clause = "and expireDate>".$self->session->datetime->time() if ($withoutExpired);
my $clause = "";
if ($withoutExpired) {
$clause = "and expireDate>".$self->session->datetime->time();
}
my $gotGroupsForUser = $self->session->stow->get("gotGroupsForUser");
if (exists $gotGroupsForUser->{$self->userId}) {
return $gotGroupsForUser->{$self->userId};