aboutsummaryrefslogtreecommitdiff
path: root/lib/Minz/ModelPdo.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2019-11-08 23:11:35 +0100
committerGravatar GitHub <noreply@github.com> 2019-11-08 23:11:35 +0100
commitf1d1d46651140961d6dc9436b3b9c66a2723f896 (patch)
tree70633ef58c95e861edbb7365b6afdb4df7a0005a /lib/Minz/ModelPdo.php
parent6d596e9e54308297d423b23bf65338d62eebc415 (diff)
Fix CLI bug regarding an empty user (#2646)
Fix https://github.com/FreshRSS/FreshRSS/issues/2644
Diffstat (limited to 'lib/Minz/ModelPdo.php')
-rw-r--r--lib/Minz/ModelPdo.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/Minz/ModelPdo.php b/lib/Minz/ModelPdo.php
index 6eb4881dc..ed88d58d1 100644
--- a/lib/Minz/ModelPdo.php
+++ b/lib/Minz/ModelPdo.php
@@ -28,13 +28,13 @@ class Minz_ModelPdo {
if ($currentUser === null) {
$currentUser = Minz_Session::param('currentUser');
}
- if ($currentUser == '') {
- throw new Minz_PDOConnectionException('Current user must not be empty!', '', Minz_Exception::ERROR);
- }
if ($currentPdo != null) {
$this->pdo = $currentPdo;
return;
}
+ if ($currentUser == '') {
+ throw new Minz_PDOConnectionException('Current user must not be empty!', '', Minz_Exception::ERROR);
+ }
if (self::$usesSharedPdo && self::$sharedPdo != null &&
($currentUser == '' || $currentUser === self::$sharedCurrentUser)) {
$this->pdo = self::$sharedPdo;