diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-01-28 13:31:13 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-01-28 13:31:13 +0100 |
| commit | 40d3e025db50b806cfb8e6619fada79401a0fc70 (patch) | |
| tree | 7b7f87b63a06bae9dc604f35ce1e6258fb48043d /app/Models | |
| parent | a670473d871307eab867385399a66672f67bcdae (diff) | |
| parent | ae5a8572d50fbbd52bdd88cce6bb80b79dbaaf1a (diff) | |
Merge pull request #1417 from tcitworld/dev
postgres fixes
Diffstat (limited to 'app/Models')
| -rw-r--r-- | app/Models/EntryDAO.php | 2 | ||||
| -rw-r--r-- | app/Models/FeedDAO.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php index 397471baa..afcde3d7f 100644 --- a/app/Models/EntryDAO.php +++ b/app/Models/EntryDAO.php @@ -649,7 +649,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $values[] = intval($id); break; case 'A': - $where .= '1 '; + $where .= '1=1 '; break; default: throw new FreshRSS_EntriesGetter_Exception('Bad type in Entry->listByType: [' . $type . ']!'); diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 68398efd5..0168aebd9 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -67,7 +67,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable { $set = ''; foreach ($valuesTmp as $key => $v) { - $set .= $key . '=?, '; + $set .= '`' . $key . '`=?, '; if ($key == 'httpAuth') { $valuesTmp[$key] = base64_encode($v); |