From ea503975d5967dd9605f8e8df8a77fc1e5bc2e3a Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Tue, 16 May 2023 12:09:39 +0200 Subject: Fix again updateLastSeenUnchanged (#5404) * Fix again updateLastSeenUnchanged https://github.com/FreshRSS/FreshRSS/pull/5382 was not good enough to fix markAsReadUponGone and introduced a regression in `entry.lastSeen`. New approach. Follow-up of https://github.com/FreshRSS/FreshRSS/pull/5315 * Minor change of mind * Fix handling of lastSeen entry.lastSeen was not always correctly initialised, and sometimes overriden --- app/Controllers/importExportController.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'app/Controllers/importExportController.php') diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index fc6cee89e..b6f7a4441 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -471,11 +471,11 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { continue; } - $values = $entry->toArray(); if (isset($existingHashForGuids['f_' . $feed_id][$entry->guid()])) { - $ok = $this->entryDAO->updateEntry($values); + $ok = $this->entryDAO->updateEntry($entry->toArray()); } else { - $ok = $this->entryDAO->addEntry($values); + $entry->_lastSeen(time()); + $ok = $this->entryDAO->addEntry($entry->toArray()); } foreach ($labels as $labelName) { -- cgit v1.2.3