Merge pull request #2049 from FreshRSS/dev1.12.0

FreshRSS 1.12.0

2 files changed, 5 insertions, 2 deletions

diff --git a/cli/README.md b/cli/README.md
index c314bd388..148e15be5 100644
--- a/cli/README.md
+++ b/cli/README.md
@@ -72,7 +72,7 @@ cd /usr/share/FreshRSS
 # --user can be a username, or '*' to loop on all users
 # Returns: 1) a * iff the user is admin, 2) the name of the user,
 #  3) the date/time of last user action, 4) the size occupied,
-#  and the number of: 5) categories, 6) feeds, 7) read articles, 8) unread articles, and 9) favourites
+#  and the number of: 5) categories, 6) feeds, 7) read articles, 8) unread articles, 9) favourites, and 10) tags
 
 ./cli/db-optimize.php --user username
 # Optimize database (reduces the size) for a given user (perform `OPTIMIZE TABLE` in MySQL, `VACUUM` in SQLite)
diff --git a/cli/user-info.php b/cli/user-info.php
index 18a415217..043bebf7c 100755
--- a/cli/user-info.php
+++ b/cli/user-info.php
@@ -16,9 +16,10 @@ foreach ($users as $username) {
 	$username = cliInitUser($username);
 	echo $username === FreshRSS_Context::$system_conf->default_user ? '*' : ' ', "\t";
 
-	$catDAO = new FreshRSS_CategoryDAO();
+	$catDAO = FreshRSS_Factory::createCategoryDao();
 	$feedDAO = FreshRSS_Factory::createFeedDao($username);
 	$entryDAO = FreshRSS_Factory::createEntryDao($username);
+	$tagDAO = FreshRSS_Factory::createTagDao($username);
 	$databaseDAO = FreshRSS_Factory::createDatabaseDAO($username);
 
 	$nbEntries = $entryDAO->countUnreadRead();
@@ -34,6 +35,7 @@ foreach ($users as $username) {
 			$nbEntries['read'], " reads\t",
 			$nbEntries['unread'], " unreads\t",
 			$nbFavorites['all'], " favourites\t",
+			$tagDAO->count(), " tags\t",
 			"\n";
 	} else {
 		echo
@@ -45,6 +47,7 @@ foreach ($users as $username) {
 			$nbEntries['read'], "\t",
 			$nbEntries['unread'], "\t",
 			$nbFavorites['all'], "\t",
+			$tagDAO->count(), "\t",
 			"\n";
 	}
 }