mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-03-04 14:36:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1026 from marienfressinaud/fix/remove-requirement-on-title

Browse Source 
Remove title from requirements on title page
This commit is contained in:
Alexandre Alapetite
2015-11-03 19:54:41 +01:00
parent 455e488e79 1b4b1b94a6
commit be4cffbbf4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/install.php
View File

@@ -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']);