From d0a7c1e0235106609ac754c5c6e6cb481a32a9a8 Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Sun, 17 Nov 2013 18:22:31 +0100
Subject: Corrige erreur default_user non défini
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/marienfressinaud/FreshRSS/issues/273
---
 public/install.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'public')

diff --git a/public/install.php b/public/install.php
index c35d52f29..d2c74b87b 100644
--- a/public/install.php
+++ b/public/install.php
@@ -293,7 +293,10 @@ function checkStep2 () {
 	        isset ($_SESSION['old_entries']) &&
 	        isset ($_SESSION['mail_login']) &&
 	        isset ($_SESSION['default_user']);
-	$defaultUser = empty($_POST['default_user']) ? $_SESSION['default_user'] : $_POST['default_user'];
+	$defaultUser = empty($_POST['default_user']) ? null : $_POST['default_user'];
+	if ($defaultUser === null) {
+		$defaultUser = empty($_SESSION['default_user']) ? '' : $_SESSION['default_user'];
+	}
 	$data = file_exists (DATA_PATH . '/' . $defaultUser . '_user.php');
 
 	return array (
-- 
cgit v1.2.3