summaryrefslogtreecommitdiffstats
path: root/db
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-11-28 15:30:35 +0100
committerBernhard Posselt <dev@bernhard-posselt.com>2015-11-28 15:30:35 +0100
commit72e599bc87753e31bb9d161d341b7f95bd671658 (patch)
tree69b99f6a08534948e6625c01ef10f9ea704e14cb /db
parent6ca631ff5c0b7d3fef16604ee4ed87354e3bbf72 (diff)
Revert "also read duplicate feed items read"
Diffstat (limited to 'db')
-rw-r--r--db/itemmapper.php24
1 files changed, 9 insertions, 15 deletions
diff --git a/db/itemmapper.php b/db/itemmapper.php
index 6033832a0..16d717963 100644
--- a/db/itemmapper.php
+++ b/db/itemmapper.php
@@ -129,21 +129,15 @@ class ItemMapper extends NewsMapper {
public function readFeed($feedId, $highestItemId, $time, $userId){
- $sql = 'UPDATE `*PREFIX*news_items`
- SET `status` = `status` & ?,
- `last_modified` = ?
- WHERE `id` IN (
- SELECT `b`.`id` FROM `*PREFIX*news_items` `a`,
- `*PREFIX*news_items` `b`
- WHERE `a`.`feed_id` = ?
- AND `a`.`id` <= ?
- AND `a`.`fingerprint` = `b`.`fingerprint`
- AND EXISTS (
- SELECT `id` FROM `*PREFIX*news_feeds`
- WHERE `user_id` = ?
- AND `id` = ?
- )
- )';
+ $sql = 'UPDATE `*PREFIX*news_items` ' .
+ 'SET `status` = `status` & ? ' .
+ ', `last_modified` = ? ' .
+ 'WHERE `feed_id` = ? ' .
+ 'AND `id` <= ? ' .
+ 'AND EXISTS (' .
+ 'SELECT * FROM `*PREFIX*news_feeds` ' .
+ 'WHERE `user_id` = ? ' .
+ 'AND `id` = ? ) ';
$params = [~StatusFlag::UNREAD, $time, $feedId, $highestItemId,
$userId, $feedId];