From da0ad82c2497ed34cb29cf78e29c75a4d4ffb8bd Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 17 Jan 2021 14:55:11 +0300 Subject: Archive cleanup: - remove code to manually archive/unarchive articles - remove ttrss_archived_feeds/orig_feed_id handling - the whole thing was implemented for this data to be kept indefinitely; it doesn't make a lot of sense to deal with this stuff now that it is expired after one month anyway (same reasons as feed browser being removed - privacy) - remove "originally from"-related stuff because of the above - also remove unused remaining frontend/backend code related to feed browser (rip) --- classes/feeds.php | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'classes/feeds.php') diff --git a/classes/feeds.php b/classes/feeds.php index a46d008a5..2015f2435 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -350,19 +350,6 @@ class Feeds extends Handler_Protected { $this->mark_timestamp(" enclosures"); - if ($line["orig_feed_id"]) { - - $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds - WHERE id = ? AND owner_uid = ?"); - $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]); - - if ($tmp_line = $ofgh->fetch()) { - $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ]; - } - } - - $this->mark_timestamp(" orig-feed-id"); - $line["updated_long"] = TimeHelper::make_local_datetime($line["updated"],true); $line["updated"] = TimeHelper::make_local_datetime($line["updated"], false, false, false, true); @@ -1840,7 +1827,7 @@ class Feeds extends Handler_Protected { uuid, lang, hide_images, - unread,feed_id,marked,published,link,last_read,orig_feed_id, + unread,feed_id,marked,published,link,last_read, last_marked, last_published, $vfeed_query_part $content_query_part @@ -1884,7 +1871,6 @@ class Feeds extends Handler_Protected { updated, unread, feed_id, - orig_feed_id, marked, published, num_comments, -- cgit v1.2.3-54-g00ecf