diff options
| author | s17t.net <mail+github@s17t.net> | 2013-05-18 18:49:30 +0200 |
|---|---|---|
| committer | s17t.net <mail+github@s17t.net> | 2013-05-18 18:49:30 +0200 |
| commit | c67fa31a2a8ec9e3e9d3015b424d20a8bd5f926b (patch) | |
| tree | 154ee0eb4afa6f0282ca7ae0da1b501601efb6a9 /db | |
| parent | f6c13efa2139a4067d4e45f2835a67312d8c8d72 (diff) | |
Fix #174
Diffstat (limited to 'db')
| -rw-r--r-- | db/feedmapper.php | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php index 438f2e78c..227c5b13c 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -51,7 +51,10 @@ class FeedMapper extends Mapper implements IMapper { StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`id` = ? ' . 'AND `feeds`.`user_id` = ? ' . - 'GROUP BY `feeds`.`id`'; + 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. + '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. + '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($id, $userId); $row = $this->findOneQuery($sql, $params); @@ -89,7 +92,10 @@ class FeedMapper extends Mapper implements IMapper { StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`user_id` = ? ' . 'AND `feeds`.`deleted_at` = 0 ' . - 'GROUP BY `feeds`.`id`'; + 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. + '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. + '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($userId); return $this->findAllRows($sql, $params); @@ -116,7 +122,10 @@ class FeedMapper extends Mapper implements IMapper { StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`url_hash` = ? ' . 'AND `feeds`.`user_id` = ? ' . - 'GROUP BY `feeds`.`id`'; + 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. + '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. + '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($hash, $userId); $row = $this->findOneQuery($sql, $params); @@ -154,4 +163,4 @@ class FeedMapper extends Mapper implements IMapper { } -}
\ No newline at end of file +} |