diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-31 21:02:59 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-05-31 21:02:59 +0200 |
| commit | d68f6fcd38e52cc8264d0f7e8df40906fea60633 (patch) | |
| tree | 7b46dd02cbb72207ebe9ec305137f628695f590e /app/Models | |
| parent | 0d32f694dd63b27bd8b46a6c3b5dec10a42b0e24 (diff) | |
| parent | 384a146883548ba0274f8cbee0c2e67dc053f70e (diff) | |
Merge branch 'FreshRSS/dev' into dev
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/EntryDAO.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index e5acc4a76..9ddcfcfb3 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -92,7 +92,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { return $this->addEntry($valuesTmp); } elseif ((int)($info[0] / 1000) !== 23) { //Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries Minz_Log::error('SQL error addEntry: ' . $info[0] . ': ' . $info[1] . ' ' . $info[2] - . ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']. ' ' . $this->addEntryPrepared); + . ' while adding entry in feed ' . $valuesTmp['id_feed'] . ' with title: ' . $valuesTmp['title']); } return false; } |