diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-03 19:54:41 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-03 19:54:41 +0100 |
| commit | be4cffbbf4de8c51d4d3e6372e4bc44eba61e9d5 (patch) | |
| tree | 96c3ae66170773df0f96dc28afa2943fdc7491e7 | |
| parent | 455e488e791cb0dd64b3b660ed8afa418d6c9641 (diff) | |
| parent | 1b4b1b94a641ca6f6e4a15189bbf37fdc1e63463 (diff) | |
Merge pull request #1026 from marienfressinaud/fix/remove-requirement-on-title
Remove title from requirements on title page
| -rw-r--r-- | app/install.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/install.php b/app/install.php index 9c878c95a..83526b60c 100644 --- a/app/install.php +++ b/app/install.php @@ -122,6 +122,8 @@ function saveStep1() { function saveStep2() { $user_default_config = Minz_Configuration::get('default_user'); if (!empty($_POST)) { + $system_default_config = Minz_Configuration::get('default_system'); + $_SESSION['title'] = $system_default_config->title; $_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries); $_SESSION['auth_type'] = param('auth_type', 'form'); $_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16); @@ -137,8 +139,7 @@ function saveStep2() { $_SESSION['passwordHash'] = $passwordHash; } - if (empty($_SESSION['title']) || - empty($_SESSION['old_entries']) || + if (empty($_SESSION['old_entries']) || empty($_SESSION['auth_type']) || empty($_SESSION['default_user'])) { return false; @@ -373,8 +374,7 @@ function freshrss_already_installed() { } function checkStep2() { - $conf = !empty($_SESSION['title']) && - !empty($_SESSION['old_entries']) && + $conf = !empty($_SESSION['old_entries']) && isset($_SESSION['mail_login']) && !empty($_SESSION['default_user']); |