From 72e599bc87753e31bb9d161d341b7f95bd671658 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Sat, 28 Nov 2015 15:30:35 +0100
Subject: Revert "also read duplicate feed items read"

This reverts commit 30e66657b8709e95240da4f252a3fce6797acfda.
---
 db/itemmapper.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

(limited to 'db')

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];
 
-- 
cgit v1.2.3