From a073ddec52f4712e934a7fb61f3291f931dabf65 Mon Sep 17 00:00:00 2001
From: Martin Kamerbeek <martin@webgui-svn>
Date: Thu, 2 Dec 2004 14:24:46 +0000
Subject: [PATCH] Use explicit groupings when applying a subscription.

---
 lib/WebGUI/Subscription.pm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/lib/WebGUI/Subscription.pm b/lib/WebGUI/Subscription.pm
index dc9512baf..936fdf1ab 100644
--- a/lib/WebGUI/Subscription.pm
+++ b/lib/WebGUI/Subscription.pm
@@ -27,14 +27,7 @@ sub apply {
 	$groupId = $self->{_properties}{subscriptionGroup};
 
 	# Make user part of the right group
-	if (WebGUI::Grouping::isInGroup($groupId, $userId)) {
-#		$expirationDate = WebGUI::Grouping::userGroupExpireDate($userId, $groupId) + $self->{_properties}{duration};
-		$expirationDate = WebGUI::Grouping::userGroupExpireDate($userId, $groupId) + _getDuration($self->{_properties}{duration});
-			
-		WebGUI::Grouping::userGroupExpireDate($userId, $groupId, $expirationDate);
-	} else {
-		WebGUI::Grouping::addUsersToGroups([$userId], [$groupId], _getDuration($self->{_properties}{duration}));
-	}
+	WebGUI::Grouping::addUsersToGroups([$userId], [$groupId], _getDuration($self->{_properties}{duration}));
 
 	# Add karma
 	WebGUI::User->new($userId)->karma($self->{_properties}{karma}, 'Subscription', 'Added for purchasing subscription '.$self->{_properties}{name});