diff options
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/_cli.php | 1 | ||||
| -rwxr-xr-x | cli/do-install.php | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cli/_cli.php b/cli/_cli.php index 4e1188428..68a0f8731 100644 --- a/cli/_cli.php +++ b/cli/_cli.php @@ -10,6 +10,7 @@ require(__DIR__ . '/../constants.php'); require(LIB_PATH . '/lib_rss.php'); //Includes class autoloader require(LIB_PATH . '/lib_install.php'); +Minz_Session::init('FreshRSS', true); Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php'); diff --git a/cli/do-install.php b/cli/do-install.php index 6535cc2e6..3fa9cd63e 100755 --- a/cli/do-install.php +++ b/cli/do-install.php @@ -93,10 +93,14 @@ Minz_Session::_param('currentUser', '_'); //Default user $ok = false; try { - $ok = initDb(); + $error = initDb(); + if ($error != '') { + $_SESSION['bd_error'] = $error; + } else { + $ok = true; + } } catch (Exception $ex) { $_SESSION['bd_error'] = $ex->getMessage(); - $ok = false; } if (!$ok) { |