Merge pull request #2655 from FreshRSS/dev1.15.2

FreshRSS 1.15.2

3 files changed, 3 insertions, 3 deletions

diff --git a/cli/_cli.php b/cli/_cli.php
index dec244bc3..4e1188428 100644
--- a/cli/_cli.php
+++ b/cli/_cli.php
@@ -37,7 +37,7 @@ function cliInitUser($username) {
 	if (FreshRSS_Context::$user_conf == null) {
 		fail('FreshRSS error: invalid configuration for user: ' . $username . "\n");
 	}
-	new Minz_ModelPdo($username);
+	Minz_Session::_param('currentUser', $username);
 
 	return $username;
 }
diff --git a/cli/do-install.php b/cli/do-install.php
index fa6bac8c8..16ac833ea 100755
--- a/cli/do-install.php
+++ b/cli/do-install.php
@@ -89,7 +89,7 @@ if (function_exists('opcache_reset')) {
 Minz_Configuration::register('system', DATA_PATH . '/config.php', FRESHRSS_PATH . '/config.default.php');
 FreshRSS_Context::$system_conf = Minz_Configuration::get('system');
 
-Minz_Session::_param('currentUser', $config['default_user']);
+Minz_Session::_param('currentUser', '_');	//Default user
 
 $ok = false;
 try {
diff --git a/cli/user-info.php b/cli/user-info.php
index aa4db7c2f..f56bd9aa5 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -43,7 +43,7 @@ if (array_key_exists('header', $options)) {
 foreach ($users as $username) {
 	$username = cliInitUser($username);
 
-	$catDAO = FreshRSS_Factory::createCategoryDao();
+	$catDAO = FreshRSS_Factory::createCategoryDao($username);
 	$feedDAO = FreshRSS_Factory::createFeedDao($username);
 	$entryDAO = FreshRSS_Factory::createEntryDao($username);
 	$tagDAO = FreshRSS_Factory::createTagDao($username);