aboutsummaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-08-01 21:36:35 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2014-08-01 21:36:35 +0200
commitd3f730287d28ecdbb8bff6445bca5944794503fd (patch)
treec28410a67dec672283445b4a71266ffc3f0f8623 /app
parent87503291817f3ed8f48220920b28bcf864cfeed8 (diff)
Install script was not keeping all config settings
https://github.com/marienfressinaud/FreshRSS/issues/537
Diffstat (limited to 'app')
-rw-r--r--app/install.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/install.php b/app/install.php
index 3767e3d91..66d663114 100644
--- a/app/install.php
+++ b/app/install.php
@@ -249,11 +249,11 @@ function saveStep3 () {
'base_url' => '',
'title' => $_SESSION['title'],
'default_user' => $_SESSION['default_user'],
- 'auth_type' => $_SESSION['auth_type'],
'allow_anonymous' => isset($_SESSION['allow_anonymous']) ? $_SESSION['allow_anonymous'] : false,
- 'allow_anonymous_refresh' => false,
- 'unsafe_autologin_enabled' => false,
- 'api_enabled' => false,
+ 'allow_anonymous_refresh' => isset($_SESSION['allow_anonymous_refresh']) ? $_SESSION['allow_anonymous_refresh'] : false,
+ 'auth_type' => $_SESSION['auth_type'],
+ 'api_enabled' => isset($_SESSION['api_enabled']) ? $_SESSION['api_enabled'] : false,
+ 'unsafe_autologin_enabled' => isset($_SESSION['unsafe_autologin_enabled']) ? $_SESSION['unsafe_autologin_enabled'] : false,
),
'db' => array(
'type' => $_SESSION['bd_type'],
@@ -499,7 +499,7 @@ function checkStep0 () {
if ($ini_array) {
$ini_general = isset($ini_array['general']) ? $ini_array['general'] : null;
if ($ini_general) {
- $keys = array('environment', 'salt', 'title', 'default_user', 'allow_anonymous', 'auth_type');
+ $keys = array('environment', 'salt', 'title', 'default_user', 'allow_anonymous', 'allow_anonymous_refresh', 'auth_type', 'api_enabled', 'unsafe_autologin_enabled');
foreach ($keys as $key) {
if ((empty($_SESSION[$key])) && isset($ini_general[$key])) {
$_SESSION[$key] = $ini_general[$key];