diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-03-23 12:08:35 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-03-23 12:08:35 +0100 |
| commit | e7a57915f9c90c144d95918048d2523418866921 (patch) | |
| tree | c952ffd76112ba10f03e6d9e54919405b3bcd268 /app/Models | |
| parent | ebd8c31c0272f135b1b55f0480d1c8c3875935fe (diff) | |
CLI user-info fixes (#2292)
* CLI missing exit codes
https://github.com/FreshRSS/FreshRSS/issues/2291
* CLI catch for outdated databases
https://github.com/FreshRSS/FreshRSS/issues/2291#issuecomment-475856890
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/TagDAO.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/app/Models/TagDAO.php b/app/Models/TagDAO.php index 0b4428f17..297d24c96 100644 --- a/app/Models/TagDAO.php +++ b/app/Models/TagDAO.php @@ -187,9 +187,17 @@ class FreshRSS_TagDAO extends Minz_ModelPdo implements FreshRSS_Searchable { public function count() { $sql = 'SELECT COUNT(*) AS count FROM `' . $this->prefix . 'tag`'; $stm = $this->bd->prepare($sql); - $stm->execute(); - $res = $stm->fetchAll(PDO::FETCH_ASSOC); - return $res[0]['count']; + if ($stm && $stm->execute()) { + $res = $stm->fetchAll(PDO::FETCH_ASSOC); + return $res[0]['count']; + } else { + $info = $stm == null ? array(0 => '', 1 => '', 2 => 'syntax error') : $stm->errorInfo(); + if ($this->autoUpdateDb($info)) { + return $this->count(); + } + Minz_Log::error('SQL error TagDAO::count: ' . $info[2]); + return false; + } } public function countEntries($id) { |