From 1b4b1b94a641ca6f6e4a15189bbf37fdc1e63463 Mon Sep 17 00:00:00 2001 From: Marien Fressinaud Date: Mon, 2 Nov 2015 22:27:57 +0100 Subject: Remove title from requirements on title page Fix https://github.com/FreshRSS/FreshRSS/issues/1025 --- app/install.php | 8 ++++---- 1 file 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']); -- cgit v1.2.3