From a3b9fd12c55a0222060348c3042b17de6f269e0a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 15 May 2013 09:09:25 +0400 Subject: [PATCH] fix support of Atom 0.3 --- classes/feedparser.php | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/classes/feedparser.php b/classes/feedparser.php index 79c1fd72..bd67ca39 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -27,6 +27,7 @@ class FeedParser { $root = $this->doc->firstChild; $xpath = new DOMXPath($this->doc); $xpath->registerNamespace('atom', 'http://www.w3.org/2005/Atom'); + $xpath->registerNamespace('atom03', 'http://purl.org/atom/ns#'); $xpath->registerNamespace('media', 'http://search.yahoo.com/mrss/'); $xpath->registerNamespace('rdf', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'); $xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/'); @@ -35,7 +36,7 @@ class FeedParser { $this->xpath = $xpath; - $root = $xpath->query("(//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0); + $root = $xpath->query("(//atom03:feed|//atom:feed|//channel|//rdf:rdf|//rdf:RDF)")->item(0); if ($root) { switch (mb_strtolower($root->tagName)) { @@ -60,18 +61,29 @@ class FeedParser { $title = $xpath->query("//atom:feed/atom:title")->item(0); + if (!$title) + $title = $xpath->query("//atom03:feed/atom03:title")->item(0); + + if ($title) { $this->title = $title->nodeValue; } $link = $xpath->query("//atom:feed/atom:link[not(@rel)]")->item(0); + if (!$link) + $link = $xpath->query("//atom03:feed/atom03:link[not(@rel)]")->item(0); + + if ($link && $link->hasAttributes()) { $this->link = $link->getAttribute("href"); } $articles = $xpath->query("//atom:entry"); + if (!$articles || $articles->length == 0) + $articles = $xpath->query("//atom03:entry"); + foreach ($articles as $article) { array_push($this->items, new FeedItem_Atom($article, $this->doc, $this->xpath)); } -- 2.39.5