Merge branch 'master' of openslx.org:lsfks/master-teamprojekt/pbs2

1 files changed, 10 insertions, 3 deletions

diff --git a/application/models/MembershipMapper.php b/application/models/MembershipMapper.php
index 2a6e57d..313248c 100644
--- a/application/models/MembershipMapper.php
+++ b/application/models/MembershipMapper.php
@@ -66,9 +66,14 @@ class Application_Model_MembershipMapper
 		}
 	}
 
-	public function find($id)
+	public function find($id, Application_Model_Membership $membership = null)
 	{
-		$membership = new Application_Model_Membership();
+		if($membership == null){
+			$return = true;
+		}
+		if($return){
+			$membership = new Application_Model_Membership();
+		}
 		$result = $this->getDbTable()->find($id);
 		if (0 == count($result)) {
 			return;
@@ -77,7 +82,9 @@ class Application_Model_MembershipMapper
 		$row = $result->current();
 		
 		$membership->setID($row->membershipID)->setGroupID($row->groupID)->setRoleID($row->roleID)->setPersonID($row->personID);
-		return $membership;
+		if($return){
+			return $membership;
+		}
 	}
 
 	public function fetchAll()