diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-22 16:16:22 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2013-12-22 16:16:22 +0100 |
| commit | 561a7b00888d555fac3d329ca17b24eb4f882454 (patch) | |
| tree | cb2a60b9ddf437d5b7e52ff3867936b9dd69a7db /public/install.php | |
| parent | 415d7a5a716726759c30151af11bd588d52acbb2 (diff) | |
Correction bugs config.php
Corrections bugs pour
https://github.com/marienfressinaud/FreshRSS/issues/272
Diffstat (limited to 'public/install.php')
| -rw-r--r-- | public/install.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/public/install.php b/public/install.php index dbbecb1a3..478650d65 100644 --- a/public/install.php +++ b/public/install.php @@ -279,7 +279,7 @@ function saveStep3 () { 'prefix' => $_SESSION['bd_prefix'], ), ); - file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($ini_array, true)); + file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($ini_array, true) . ';'); if (file_exists(DATA_PATH . '/config.php') && file_exists(DATA_PATH . '/application.ini')) { @unlink(DATA_PATH . '/application.ini'); //v0.6 @@ -482,9 +482,12 @@ function checkStep0 () { if (file_exists(DATA_PATH . '/config.php')) { $ini_array = include(DATA_PATH . '/config.php'); - elseif (file_exists(DATA_PATH . '/application.ini')) { + } elseif (file_exists(DATA_PATH . '/application.ini')) { $ini_array = parse_ini_file(DATA_PATH . '/application.ini', true); + } else { + $ini_array = null; } + if ($ini_array) { $ini_general = isset($ini_array['general']) ? $ini_array['general'] : null; if ($ini_general) { |