aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-17 18:22:31 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-17 18:22:31 +0100
commitd0a7c1e0235106609ac754c5c6e6cb481a32a9a8 (patch)
tree86e1541ab30dc458fdd63f4c2a16df4d52f788d4
parent86bede27704e55ab21dc019dadf0b34c2a66c098 (diff)
Corrige erreur default_user non défini
https://github.com/marienfressinaud/FreshRSS/issues/273
-rw-r--r--public/install.php5
1 files changed, 4 insertions, 1 deletions
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 (