diff options
author | Andrew Dolgov <[email protected]> | 2013-12-19 13:19:55 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-12-19 13:19:55 +0400 |
commit | d31d521f79026f0341fb4945750b68c504f87e19 (patch) | |
tree | eacd7eada48c824e4b0636796fb24b31809e0a32 /classes | |
parent | f6c61b2d55ff70819bc1582791fdc8df149eb22f (diff) | |
parent | 2d937e9f67b654110780cad8d4084fadcc508bf5 (diff) |
Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
Diffstat (limited to 'classes')
-rw-r--r-- | classes/feeditem/common.php | 17 | ||||
-rw-r--r-- | classes/feedparser.php | 1 |
2 files changed, 16 insertions, 2 deletions
diff --git a/classes/feeditem/common.php b/classes/feeditem/common.php index 58065b198..80bebf8fb 100644 --- a/classes/feeditem/common.php +++ b/classes/feeditem/common.php @@ -44,13 +44,26 @@ abstract class FeedItem_Common extends FeedItem { } } - // todo function get_comments_url() { + //RSS only. Use a query here to avoid namespace clashes (e.g. with slash). + //might give a wrong result if a default namespace was declared (possible with XPath 2.0) + $com_url = $this->xpath->query("comments", $this->elem)->item(0); + if($com_url) + return $com_url->nodeValue; + + //Atom Threading Extension (RFC 4685) stuff. Could be used in RSS feeds, so it's in common. + //'text/html' for type is too restrictive? + $com_url = $this->xpath->query("atom:link[@rel='replies' and contains(@type,'text/html')]/@href", $this->elem)->item(0); + + if($com_url) + return $com_url->nodeValue; } function get_comments_count() { - $comments = $this->xpath->query("slash:comments", $this->elem)->item(0); + //also query for ATE stuff here + $query = "slash:comments|thread:total|atom:link[@rel='replies']/@thread:count"; + $comments = $this->xpath->query($query, $this->elem)->item(0); if ($comments) { return $comments->nodeValue; diff --git a/classes/feedparser.php b/classes/feedparser.php index de6c56542..187875b5f 100644 --- a/classes/feedparser.php +++ b/classes/feedparser.php @@ -97,6 +97,7 @@ class FeedParser { $xpath->registerNamespace('slash', 'http://purl.org/rss/1.0/modules/slash/'); $xpath->registerNamespace('dc', 'http://purl.org/dc/elements/1.1/'); $xpath->registerNamespace('content', 'http://purl.org/rss/1.0/modules/content/'); + $xpath->registerNamespace('thread', 'http://purl.org/syndication/thread/1.0'); $this->xpath = $xpath; |