diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:02:02 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-09-14 19:02:02 +0200 |
| commit | ff8531fb64ce0bf7c5d0dd01ab672e1a6584f246 (patch) | |
| tree | 695a84659c313932fb3add423679aa0b90a0bc82 /app/models/Entry.php | |
| parent | feff58e2ebdcaf7b789c8051b92aee27d56fa2d9 (diff) | |
| parent | de6e1b0a86c29845a2f8179aa0ef45d48e0d7ebb (diff) | |
Merge branch 'sqlDuplicateEntries' of https://github.com/Alkarex/FreshRSS into Alkarex-sqlDuplicateEntries
Diffstat (limited to 'app/models/Entry.php')
| -rwxr-xr-x | app/models/Entry.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/models/Entry.php b/app/models/Entry.php index c247c6362..d5a150bb1 100755 --- a/app/models/Entry.php +++ b/app/models/Entry.php @@ -216,7 +216,9 @@ class EntryDAO extends Model_pdo { return true; } else { $info = $stm->errorInfo(); - Minz_Log::record ('SQL error : ' . $info[2], Minz_Log::NOTICE); + if ((int)($info[0] / 1000) !== 23) { //Filter out "SQLSTATE Class code 23: Constraint Violation" because of expected duplicate entries + Minz_Log::record ('SQL error ' . $info[0] . ': ' . $info[1] . ' ' . $info[2], Minz_Log::NOTICE); //TODO: Consider adding a Minz_Log::DEBUG level + } return false; } } |