From f045bd0ba337d60b91827c7530f00a780afd7b66 Mon Sep 17 00:00:00 2001 From: kesselb Date: Fri, 27 Dec 2019 03:51:06 +0100 Subject: Update httpLastModified from the feed response (#594) LastModified is used (in a feed context to see if a user edited a feed). httpLastModified to store the last-modified response from the source. Signed-off-by: Daniel Kesselberg --- lib/Fetcher/FeedFetcher.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index 5a0f0e4e7..a1b7e08ec 100755 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -206,7 +206,7 @@ class FeedFetcher implements IFeedFetcher $item->setGuid($parsedItem->getPublicId()); $item->setGuidHash(md5($item->getGuid())); - $lastmodified = $parsedItem->getLastModified() ?? new \DateTime(); + $lastmodified = $parsedItem->getLastModified() ?? new DateTime(); if ($parsedItem->getValue('pubDate') !== null) { $pubDT = new DateTime($parsedItem->getValue('pubDate')); } elseif ($parsedItem->getValue('published') !== null) { @@ -288,8 +288,9 @@ class FeedFetcher implements IFeedFetcher $newFeed->setUrl($url); // the url used to add the feed $newFeed->setLocation($location); // the url where the feed was found $newFeed->setLink($feed->getLink()); // attribute in the feed - $lastmodified = $feed->getLastModified() ?? new DateTime(); - $newFeed->setLastModified($lastmodified->getTimestamp()); + if ($feed->getLastModified() instanceof DateTime) { + $newFeed->setHttpLastModified($feed->getLastModified()->format(DateTime::RSS)); + } $newFeed->setAdded($this->time->getTime()); if (!$getFavicon) { -- cgit v1.2.3