Skip to content

Commit be4cffb

Browse files
committed
Merge pull request FreshRSS#1026 from marienfressinaud/fix/remove-requirement-on-title
Remove title from requirements on title page
2 parents 455e488 + 1b4b1b9 commit be4cffb

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

app/install.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ function saveStep1() {
122122
function saveStep2() {
123123
$user_default_config = Minz_Configuration::get('default_user');
124124
if (!empty($_POST)) {
125+
$system_default_config = Minz_Configuration::get('default_system');
126+
$_SESSION['title'] = $system_default_config->title;
125127
$_SESSION['old_entries'] = param('old_entries', $user_default_config->old_entries);
126128
$_SESSION['auth_type'] = param('auth_type', 'form');
127129
$_SESSION['default_user'] = substr(preg_replace('/[^a-zA-Z0-9]/', '', param('default_user', '')), 0, 16);
@@ -137,8 +139,7 @@ function saveStep2() {
137139
$_SESSION['passwordHash'] = $passwordHash;
138140
}
139141

140-
if (empty($_SESSION['title']) ||
141-
empty($_SESSION['old_entries']) ||
142+
if (empty($_SESSION['old_entries']) ||
142143
empty($_SESSION['auth_type']) ||
143144
empty($_SESSION['default_user'])) {
144145
return false;
@@ -373,8 +374,7 @@ function freshrss_already_installed() {
373374
}
374375

375376
function checkStep2() {
376-
$conf = !empty($_SESSION['title']) &&
377-
!empty($_SESSION['old_entries']) &&
377+
$conf = !empty($_SESSION['old_entries']) &&
378378
isset($_SESSION['mail_login']) &&
379379
!empty($_SESSION['default_user']);
380380

0 commit comments

Comments
 (0)