|
@@ -132,7 +132,7 @@ function saveStep2() {
|
|
|
$config_array = [
|
|
$config_array = [
|
|
|
'salt' => generateSalt(),
|
|
'salt' => generateSalt(),
|
|
|
'base_url' => $base_url,
|
|
'base_url' => $base_url,
|
|
|
- 'default_user' => 'admin',
|
|
|
|
|
|
|
+ 'default_user' => '_',
|
|
|
'db' => [
|
|
'db' => [
|
|
|
'type' => $_SESSION['bd_type'],
|
|
'type' => $_SESSION['bd_type'],
|
|
|
'host' => $_SESSION['bd_host'],
|
|
'host' => $_SESSION['bd_host'],
|
|
@@ -154,12 +154,18 @@ function saveStep2() {
|
|
|
@unlink(DATA_PATH . '/config.php'); //To avoid access-rights problems
|
|
@unlink(DATA_PATH . '/config.php'); //To avoid access-rights problems
|
|
|
file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($config_array, true) . ";\n");
|
|
file_put_contents(DATA_PATH . '/config.php', "<?php\n return " . var_export($config_array, true) . ";\n");
|
|
|
|
|
|
|
|
|
|
+ if (function_exists('opcache_reset')) {
|
|
|
|
|
+ opcache_reset();
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
|
|
Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
|
|
|
FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
|
|
FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
|
|
|
|
|
|
|
|
$ok = false;
|
|
$ok = false;
|
|
|
try {
|
|
try {
|
|
|
- $ok = checkDb();
|
|
|
|
|
|
|
+ Minz_Session::_param('currentUser', $config_array['default_user']);
|
|
|
|
|
+ $ok = initDb();
|
|
|
|
|
+ Minz_Session::_param('currentUser');
|
|
|
} catch (Exception $ex) {
|
|
} catch (Exception $ex) {
|
|
|
$_SESSION['bd_error'] = $ex->getMessage();
|
|
$_SESSION['bd_error'] = $ex->getMessage();
|
|
|
$ok = false;
|
|
$ok = false;
|