aboutsummaryrefslogtreecommitdiff
path: root/app/Models/Auth.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 22:43:24 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-06 22:43:24 +0100
commit8e6ab12e89504e3c44f766d319ac00cc7d58810a (patch)
tree878a70cc161a693717e523c190cf5f0366317303 /app/Models/Auth.php
parentce9298439b882d64c403eded1575db8f029aa389 (diff)
Fix a bug in FreshRSS_Auth::giveAccess()
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/Models/Auth.php')
-rw-r--r--app/Models/Auth.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 917e151ca..4e7a71947 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -82,11 +82,11 @@ class FreshRSS_Auth {
* Gives access to the current user.
*/
public static function giveAccess() {
- $user_conf = Minz_Configuration::get('user');
+ $current_user = Minz_Session::param('currentUser');
+ $user_conf = get_user_configuration($current_user);
$system_conf = Minz_Configuration::get('system');
- $auth_type = $system_conf->auth_type;
- switch ($auth_type) {
+ switch ($system_conf->auth_type) {
case 'form':
self::$login_ok = Minz_Session::param('passwordHash') === $user_conf->passwordHash;
break;