From e22d4dfdd3e708f4558735e3dc2864361e2cacc2 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sat, 3 Mar 2018 10:33:40 +0100
Subject: Fix bug when using double authentication (#1809)

https://github.com/FreshRSS/FreshRSS/issues/1807
---
 app/Models/Auth.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/Models/Auth.php')

diff --git a/app/Models/Auth.php b/app/Models/Auth.php
index 32b673b6d..8c711308c 100644
--- a/app/Models/Auth.php
+++ b/app/Models/Auth.php
@@ -63,7 +63,6 @@ class FreshRSS_Auth {
 			$login_ok = $current_user != '';
 			if ($login_ok) {
 				Minz_Session::_param('currentUser', $current_user);
-				Minz_Session::_param('REMOTE_USER', $current_user);
 			}
 			return $login_ok;
 		case 'none':
@@ -102,6 +101,7 @@ class FreshRSS_Auth {
 		}
 
 		Minz_Session::_param('loginOk', self::$login_ok);
+		Minz_Session::_param('REMOTE_USER', httpAuthUser());
 	}
 
 	/**
@@ -133,6 +133,7 @@ class FreshRSS_Auth {
 		self::$login_ok = false;
 		Minz_Session::_param('loginOk');
 		Minz_Session::_param('csrf');
+		Minz_Session::_param('REMOTE_USER');
 		$system_conf = Minz_Configuration::get('system');
 
 		$username = '';
-- 
cgit v1.2.3