From 18de531bc1e468b9a31214be95398cacdb5defe9 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Tue, 11 May 2010 18:40:40 -0700
Subject: [PATCH] Fix typos in recursive Group->getAllUsers calls.  Fixes bug
 #11566

---
 docs/changelog/7.x.x.txt | 1 +
 lib/WebGUI/Group.pm      | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 7804874f7..0404d8256 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -13,6 +13,7 @@
  - fixed #11562: Missing perl modules in gotcha
  - fixed #11565: Can't clear cache on plainblack.com
  - fixed #11540: Pending version tags are not completed on approval under certain conditions
+ - fixed #11566: Group API: group membership cannot be checked without consideration of expiration dates.
 
 7.9.4
  - We're shipping underscore.js now for its suite of extremely handy utility
diff --git a/lib/WebGUI/Group.pm b/lib/WebGUI/Group.pm
index ad4c98307..00e53c32a 100644
--- a/lib/WebGUI/Group.pm
+++ b/lib/WebGUI/Group.pm
@@ -577,12 +577,11 @@ sub getAllUsers {
 		$self->session->errorHandler->fatal("Endless recursive loop detected while determining groups in group.\nRequested groupId: ".$self->getId);
 	}
 	my $groups = $self->getGroupsIn();
-	##Have to iterate twice due to the withoutExpired clause.
 	foreach my $groupId (@{ $groups }) {
 		my $subGroup = WebGUI::Group->new($self->session, $groupId);
         next
             if !$subGroup;
-        push @users, @{ $subGroup->getAllUsers(1, $withoutExpired, $loopCount) };
+        push @users, @{ $subGroup->getAllUsers($withoutExpired, $loopCount) };
 	}
 	my %users = map { $_ => 1 } @users;
 	@users = keys %users;