Skip to content
Snippets Groups Projects
Commit dfbb6478 authored by xamgore's avatar xamgore
Browse files

Fix recent movement of Account & User models

parent a707178d
Branches
Tags
No related merge requests found
......@@ -82,10 +82,9 @@ class User implements ArrayAccess
* @return array Пару вида <tt>(is_ok, err_msg)</tt>
*/
public function signUp($code, $email, $login, $password) {
$model = &$this->_model;
$account = Account::instance();
$isValid = $model->isActivationCodeValid($code);
$isValid = Model_Account::isActivationCodeValid($code);
if (!$isValid) {
return array(false, 'invalid_code');
}
......@@ -101,7 +100,7 @@ class User implements ArrayAccess
}
}
$id = $model->activateAccount($login, $password, $email, $code);
$id = Model_Account::activateAccount($login, $password, $email, $code);
$this->completeSignIn($id, $this->hash($password));
return array(true, 'ok');
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment