diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-04 17:21:43 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-04-04 17:21:43 +0200 |
| commit | 1ffedced057ad7968629c974574b5f66adf01b48 (patch) | |
| tree | 3e40d318ac3122f1dee6328094dff6b566b63c2c /db/feedmapper.php | |
| parent | b723c12e4c3e0039d9785861d4ad204fd899ac52 (diff) | |
fixes mappers by using the correct status condition
Diffstat (limited to 'db/feedmapper.php')
| -rw-r--r-- | db/feedmapper.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/db/feedmapper.php b/db/feedmapper.php index 7f0466647..f2c3a8ada 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -43,11 +43,11 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) > 0 ' . + 'AND (`items`.`status` & ?) = ? ' . 'WHERE `feeds`.`id` = ? ' . 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, $id, $userId); + $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $id, $userId); $row = $this->findOneQuery($sql, $params); $feed = new Feed(); @@ -76,10 +76,10 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) > 0 ' . + 'AND (`items`.`status` & ?) = ? ' . 'WHERE `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, $userId); + $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $userId); return $this->findAllRows($sql, $params); } @@ -97,11 +97,11 @@ class FeedMapper extends Mapper implements IMapper { 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . - 'AND (`items`.`status` & ?) > 0 ' . + 'AND (`items`.`status` & ?) = ? ' . 'WHERE `feeds`.`url_hash` = ? ' . 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`'; - $params = array(StatusFlag::UNREAD, $hash, $userId); + $params = array(StatusFlag::UNREAD, StatusFlag::UNREAD, $hash, $userId); $row = $this->findOneQuery($sql, $params); $feed = new Feed(); |