Merge branch 'master' of w00d5t0ck.info:blueroses

This commit is contained in:
Gergely POLONKAI 2012-08-16 10:36:00 +02:00
commit de00a6ad21
2 changed files with 1 additions and 2 deletions

View File

@ -89,7 +89,7 @@ class GroupController extends Controller
);
}
$membership = new UserGroupMembership();
$membership = new UserGroupMembership($user, $group);
$membership->setUser($user);
$membership->setGroup($group);
$membership->setMembershipRequestedAt(new \DateTime('now'));

View File

@ -20,7 +20,6 @@ class UserGroupMembership
$this->setUser($user);
$this->setGroup($group);
$this->setMembershipRequestedAt(new \DateTime('now'));
$this->setMembershipAcceptedAt(new \DateTime('now'));
}
/**