From dfbb6478313969e171531c39faa28627e99633de Mon Sep 17 00:00:00 2001
From: xamgore <xamgore@ya.ru>
Date: Tue, 9 Jun 2015 16:59:13 +0300
Subject: [PATCH] Fix recent movement of Account & User models
---
~dev_rating/application/classes/User.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/~dev_rating/application/classes/User.php b/~dev_rating/application/classes/User.php
index 12ee9c9df..c28b613fa 100644
--- a/~dev_rating/application/classes/User.php
+++ b/~dev_rating/application/classes/User.php
@@ -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');
}
--
GitLab