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

1 files changed, 10 insertions, 3 deletions

diff --git a/application/models/PersonMapper.php b/application/models/PersonMapper.php
index 038670d..b2cbf39 100644
--- a/application/models/PersonMapper.php
+++ b/application/models/PersonMapper.php
@@ -66,9 +66,14 @@ class Application_Model_PersonMapper
 		}
 	}
 
-	public function find($id)
+	public function find($id,Application_Model_Person $person = null)
 	{
-		$person = new Application_Model_Person();
+		if($person == null){
+			$return = true;
+		}
+		if($return){
+			$person = new Application_Model_Person();
+		}
 		$result = $this->getDbTable()->find($id);
 		if (0 == count($result)) {
 			return;
@@ -77,7 +82,9 @@ class Application_Model_PersonMapper
 		$row = $result->current();
 		
 		$person->setID($row->personID)->setTitle($row->title)->setName($row->name)->setFirstname($row->firstname)->setStreet($row->street)->setHousenumber($row->housenumber)->setCity($row->city)->setPostalcode($row->postalcode)->setLogindate($row->logindate)->setRegisterdate($row->registerdate)->setEmail($row->email)->setLogin($row->login)->setPassword($row->password)->setPasswordSalt($row->password_salt);
-		return $person;
+		if($return){
+			return $person;
+		}
 	}
 
 	public function fetchAll()