diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-10-02 19:05:49 +0300 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-10-02 19:05:49 +0300 |
commit | 8d639753606e8e8a4ae14edb8fd2f37fb6b92995 (patch) | |
tree | 4b4437fad6ca3bd0c9b3dbeaca4ccf13f622961f /lib | |
parent | e4e226c394ccbbfd952ab38d2317d354211ead6d (diff) |
revert
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Db/Item.php | 6 | ||||
-rw-r--r-- | lib/Fetcher/FeedFetcher.php | 3 | ||||
-rw-r--r-- | lib/Service/FeedService.php | 3 |
3 files changed, 2 insertions, 10 deletions
diff --git a/lib/Db/Item.php b/lib/Db/Item.php index f19843c8e..943002c32 100644 --- a/lib/Db/Item.php +++ b/lib/Db/Item.php @@ -57,7 +57,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { protected $title; protected $author; protected $pubDate; - protected $updatedDate; protected $body; protected $enclosureMime; protected $enclosureLink; @@ -70,7 +69,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { public function __construct() { $this->addType('pubDate', 'integer'); - $this->addType('updatedDate', 'integer'); $this->addType('feedId', 'integer'); $this->addType('status', 'integer'); $this->addType('rtl', 'boolean'); @@ -124,7 +122,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { 'title' => $this->getTitle(), 'author' => $this->getAuthor(), 'pubDate' => $this->getPubDate(), - 'updatedDate' => $this->getUpdatedDate(), 'body' => $this->getBody(), 'enclosureMime' => $this->getEnclosureMime(), 'enclosureLink' => $this->getEnclosureLink(), @@ -147,7 +144,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { 'title' => $this->getTitle(), 'author' => $this->getAuthor(), 'pubDate' => $this->getPubDate(), - 'updatedDate' => $this->getUpdatedDate(), 'body' => $this->getBody(), 'enclosureMime' => $this->getEnclosureMime(), 'enclosureLink' => $this->getEnclosureLink(), @@ -168,7 +164,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { 'title' => $this->getTitle(), 'author' => $this->getAuthor(), 'pubDate' => $this->getPubDate(), - 'updatedDate' => $this->getUpdatedDate(), 'body' => $this->getBody(), 'enclosureMime' => $this->getEnclosureMime(), 'enclosureLink' => $this->getEnclosureLink(), @@ -191,7 +186,6 @@ class Item extends Entity implements IAPI, \JsonSerializable { $item->setTitle($import['title']); $item->setAuthor($import['author']); $item->setPubDate($import['pubDate']); - $item->setUpdatedDate($import['updatedDate']); $item->setBody($import['body']); $item->setEnclosureMime($import['enclosureMime']); $item->setEnclosureLink($import['enclosureLink']); diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php index 194a927f9..9336d6914 100644 --- a/lib/Fetcher/FeedFetcher.php +++ b/lib/Fetcher/FeedFetcher.php @@ -240,8 +240,7 @@ class FeedFetcher implements IFeedFetcher { $item->setUrl($parsedItem->getUrl()); $item->setGuid($parsedItem->getId()); $item->setGuidHash($item->getGuid()); - $item->setPubDate($parsedItem->getPublishedDate()->getTimestamp()); - $item->setUpdatedDate($parsedItem->getUpdatedDate()->getTimestamp()); + $item->setPubDate($parsedItem->getDate()->getTimestamp()); $item->setRtl($this->determineRtl($parsedItem, $parsedFeed)); // unescape content because angularjs helps against XSS diff --git a/lib/Service/FeedService.php b/lib/Service/FeedService.php index f17b759e3..c1c1aa64a 100644 --- a/lib/Service/FeedService.php +++ b/lib/Service/FeedService.php @@ -246,7 +246,7 @@ class FeedService extends Service { // in case of update if ($forceUpdate || - $item->getUpdatedDate() > $dbItem->getUpdatedDate()) { + $item->getPubDate() > $dbItem->getPubDate()) { $dbItem->setTitle($item->getTitle()); $dbItem->setUrl($item->getUrl()); @@ -255,7 +255,6 @@ class FeedService extends Service { $dbItem->setRtl($item->getRtl()); $dbItem->setLastModified($item->getLastModified()); $dbItem->setPubDate($item->getPubDate()); - $dbItem->setUpdatedDate($item->getUpdatedDate()); $dbItem->setEnclosureMime($item->getEnclosureMime()); $dbItem->setEnclosureLink($item->getEnclosureLink()); $dbItem->setBody( |