From 8e6ab12e89504e3c44f766d319ac00cc7d58810a Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Tue, 6 Jan 2015 22:43:24 +0100 Subject: Fix a bug in FreshRSS_Auth::giveAccess() See https://github.com/FreshRSS/FreshRSS/issues/730 --- app/Models/Auth.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/Models/Auth.php') 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; -- cgit v1.2.3