aboutsummaryrefslogtreecommitdiff
path: root/cli/_cli.php
diff options
context:
space:
mode:
Diffstat (limited to 'cli/_cli.php')
-rw-r--r--cli/_cli.php9
1 files changed, 2 insertions, 7 deletions
diff --git a/cli/_cli.php b/cli/_cli.php
index 68a0f8731..dc7ee9d64 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -11,10 +11,7 @@ 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');
-FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
+FreshRSS_Context::initSystem();
Minz_Translate::init('en');
FreshRSS_Context::$isCli = true;
@@ -34,11 +31,9 @@ function cliInitUser($username) {
fail('FreshRSS error: user not found: ' . $username . "\n");
}
- FreshRSS_Context::$user_conf = get_user_configuration($username);
- if (FreshRSS_Context::$user_conf == null) {
+ if (!FreshRSS_Context::initUser($username)) {
fail('FreshRSS error: invalid configuration for user: ' . $username . "\n");
}
- Minz_Session::_param('currentUser', $username);
return $username;
}