From a6db495494130da044a95b57c65d944be45746ee Mon Sep 17 00:00:00 2001
From: Alexandre Alapetite <alexandre@alapetite.fr>
Date: Mon, 24 Oct 2016 02:25:16 +0200
Subject: [PATCH] CLI actualize-user

https://github.com/FreshRSS/FreshRSS/issues/1095
---
 cli/actualize-user.php | 23 +++++++++++++++++++++++
 lib/Minz/ModelPdo.php  |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 cli/actualize-user.php

diff --git a/cli/actualize-user.php b/cli/actualize-user.php
new file mode 100644
index 000000000..29d51753a
--- /dev/null
+++ b/cli/actualize-user.php
@@ -0,0 +1,23 @@
+#!/usr/bin/php
+<?php
+require('_cli.php');
+
+$options = getopt('', array(
+		'user:',
+	));
+
+if (empty($options['user'])) {
+	fail('Usage: ' . basename(__FILE__) . " --user username");
+}
+
+$username = cliInitUser($options['user']);
+
+fwrite(STDERR, 'FreshRSS actualizing user “' . $username . "”…\n");
+
+list($nbUpdatedFeeds, $feed) = FreshRSS_feed_Controller::actualizeFeed(0, '', true);
+
+echo "FreshRSS actualized $nbUpdatedFeeds feeds for $username\n";
+
+invalidateHttpCache($username);
+
+done($nbUpdatedFeeds > 0);
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 45139b0d6..6e8d60bc9 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -37,9 +37,10 @@ class Minz_ModelPdo {
 	 */
 	public function __construct($currentUser = null) {
 		if ($currentUser === null) {
-			$currentUser = Minz_Session::param('currentUser', '_');
+			$currentUser = Minz_Session::param('currentUser');
 		}
-		if (self::$useSharedBd && self::$sharedBd != null && $currentUser === self::$sharedCurrentUser) {
+		if (self::$useSharedBd && self::$sharedBd != null && 
+			($currentUser == null || $currentUser === self::$sharedCurrentUser)) {
 			$this->bd = self::$sharedBd;
 			$this->prefix = self::$sharedPrefix;
 			$this->current_user = self::$sharedCurrentUser;