diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 21:54:46 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 21:54:46 +0100 |
| commit | eff804572f449a1072274eb6623709b162db4da9 (patch) | |
| tree | b8692658db5058b81a053c18f73143494bedb259 /app/Controllers/userController.php | |
| parent | dd41642ce617ccf873974d884043c21c1fe10223 (diff) | |
Fix setters on $user_conf
Old setters does not exist anymore, remove them.
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/Controllers/userController.php')
| -rw-r--r-- | app/Controllers/userController.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Controllers/userController.php b/app/Controllers/userController.php index bfc2dfb3b..c3c6e06d9 100644 --- a/app/Controllers/userController.php +++ b/app/Controllers/userController.php @@ -39,7 +39,7 @@ class FreshRSS_user_Controller extends Minz_ActionController { $passwordPlain = ''; $passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js $ok &= ($passwordHash != ''); - FreshRSS_Context::$user_conf->_passwordHash($passwordHash); + FreshRSS_Context::$user_conf->passwordHash = $passwordHash; } Minz_Session::_param('passwordHash', FreshRSS_Context::$user_conf->passwordHash); @@ -52,12 +52,12 @@ class FreshRSS_user_Controller extends Minz_ActionController { $passwordPlain = ''; $passwordHash = preg_replace('/^\$2[xy]\$/', '\$2a\$', $passwordHash); //Compatibility with bcrypt.js $ok &= ($passwordHash != ''); - FreshRSS_Context::$user_conf->_apiPasswordHash($passwordHash); + FreshRSS_Context::$user_conf->apiPasswordHash = $passwordHash; } // TODO: why do we need of hasAccess here? if (FreshRSS_Auth::hasAccess('admin')) { - FreshRSS_Context::$user_conf->_mail_login(Minz_Request::param('mail_login', '', true)); + FreshRSS_Context::$user_conf->mail_login = Minz_Request::param('mail_login', '', true); } $email = FreshRSS_Context::$user_conf->mail_login; Minz_Session::_param('mail', $email); |