X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_person_signup.php;h=c32a79eb151b342602bbe23fb4128fbe08d56b77;hb=2000761d7f799df04644d6ed31dd1f16a3fbb660;hp=9b3ab6fa881712b8a36ca1c4810c2800746279a1;hpb=91628f4fab0d4ac9a1a675b76a14f17e9241dbf2;p=Pman.Core diff --git a/DataObjects/Core_person_signup.php b/DataObjects/Core_person_signup.php index 9b3ab6fa..c32a79eb 100644 --- a/DataObjects/Core_person_signup.php +++ b/DataObjects/Core_person_signup.php @@ -28,8 +28,7 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject public $person_id; public $person_table; - public $invite_id; - public $invite_table; + public $inviter_id; function convertTo($target = false) { @@ -42,11 +41,7 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject // this shold not really happen... if($target->get('email', $this->email)){ - $this->person_id = $target->id; - $this->person_table = $target->tableName(); - $this->update($old); - - return $target; + return false; } $target->setFrom($this->toArray()); @@ -57,14 +52,8 @@ class Pman_Core_DataObjects_Core_person_signup extends DB_DataObject $this->person_table = $target->tableName(); $this->update($old); - if(!empty($this->invite_id) && !empty($this->invite_table)){ - $friend = DB_DataObject::factory($this->invite_table); - $friend->setFrom(array( - 'person_id' => $this->invite_id, - 'friend_id' => $target->id - )); - - $friend->insert(); + if(!empty($this->inviter_id) && method_exists($target, 'createFriend')){ + $target->createFriend($this->inviter_id); } return $target;