parser: properly support tag subtrees instead of text content for article content

[tt-rss.git] / classes / feeditem / rss.php

diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php
index 95f3acdebb5dbb2df9aba9837139bb2ffe2b6f38..080e4083ab971743fcbfb874bdca888b3ac34729 100644 (file)
--- a/classes/feeditem/rss.php
+++ b/classes/feeditem/rss.php
@@ -71,16 +71,19 @@ class FeedItem_RSS extends FeedItem_Common {
                $contentB = $this->elem->getElementsByTagName("description")->item(0);
 
                if ($contentA && !$contentB) {
-                       return $contentA->c14n();
+                       return $this->subtree_or_text($contentA);
                }
 
+
                if ($contentB && !$contentA) {
-                       return $contentB->c14n();
+                       return $this->subtree_or_text($contentB);
                }
 
                if ($contentA && $contentB) {
-                       return mb_strlen($contentA->nodeValue) > mb_strlen($contentB->nodeValue) ?
-                               $contentA->c14n() : $contentB->c14n();
+                       $resultA = $this->subtree_or_text($contentA);
+                       $resultB = $this->subtree_or_text($contentB);
+
+                       return mb_strlen($resultA) > mb_strlen($resultB) ? $resultA : $resultB;
                }
        }
 
@@ -88,7 +91,7 @@ class FeedItem_RSS extends FeedItem_Common {
                $summary = $this->elem->getElementsByTagName("description")->item(0);
 
                if ($summary) {
-                       return $summary->c14n();
+                       return $summary->nodeValue;
                }
        }