diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-11-21 13:53:36 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-11-21 13:53:47 +0100 |
commit | 8ddead06277f7c863fe048e9990d4c9ce0c24424 (patch) | |
tree | 699416065dcf10871bf416164f36f1d05a03a480 /vendor/fguillot/picofeed/lib/PicoFeed | |
parent | 3306d28e2d45fa03c2ca5b93de45ad59e7aad3f0 (diff) |
fix #660
Diffstat (limited to 'vendor/fguillot/picofeed/lib/PicoFeed')
-rw-r--r-- | vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php | 5 | ||||
-rw-r--r-- | vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php index 5c7068760..1217bc4b0 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Parser/Atom.php @@ -119,7 +119,10 @@ class Atom extends Parser */ public function findItemDate(SimpleXMLElement $entry, Item $item) { - $item->date = $this->parseDate((string) $entry->updated); + $published = isset($entry->published) ? $this->parseDate((string) $entry->published) : 0; + $updated = isset($entry->updated) ? $this->parseDate((string) $entry->updated) : 0; + + $item->date = max($published, $updated) ?: time(); } /** diff --git a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php index f54062f40..a64eb139c 100644 --- a/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php +++ b/vendor/fguillot/picofeed/lib/PicoFeed/Reader/Reader.php @@ -86,8 +86,8 @@ class Reader { $client = $this->download($url, $last_modified, $etag); - // It's already a feed - if ($this->detectFormat($client->getContent())) { + // It's already a feed or the feed was not modified + if (!$client->isModified() || $this->detectFormat($client->getContent())) { return $client; } |