From: Andrew Dolgov Date: Fri, 22 Jan 2016 22:24:13 +0000 (+0300) Subject: Revert "parser: use node->c14n() instead of expecting html in nodeValue" X-Git-Tag: 16.3~50 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d2bb392bae5d3de97e1e99bc810524e149c5c199;p=tt-rss.git Revert "parser: use node->c14n() instead of expecting html in nodeValue" This reverts commit 1383514ad9e7630a3d9627e052780b8fcadab25a. --- diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php index 7990a61c..dfac7149 100644 --- a/classes/feeditem/atom.php +++ b/classes/feeditem/atom.php @@ -75,7 +75,7 @@ class FeedItem_Atom extends FeedItem_Common { } } - return $content->c14n(); + return $content->nodeValue; } } @@ -95,7 +95,7 @@ class FeedItem_Atom extends FeedItem_Common { } } - return $content->c14n(); + return $content->nodeValue; } } diff --git a/classes/feeditem/rss.php b/classes/feeditem/rss.php index 95f3acde..27a364b8 100644 --- a/classes/feeditem/rss.php +++ b/classes/feeditem/rss.php @@ -71,16 +71,17 @@ class FeedItem_RSS extends FeedItem_Common { $contentB = $this->elem->getElementsByTagName("description")->item(0); if ($contentA && !$contentB) { - return $contentA->c14n(); + return $contentA->nodeValue; } + if ($contentB && !$contentA) { - return $contentB->c14n(); + return $contentB->nodeValue; } if ($contentA && $contentB) { return mb_strlen($contentA->nodeValue) > mb_strlen($contentB->nodeValue) ? - $contentA->c14n() : $contentB->c14n(); + $contentA->nodeValue : $contentB->nodeValue; } } @@ -88,7 +89,7 @@ class FeedItem_RSS extends FeedItem_Common { $summary = $this->elem->getElementsByTagName("description")->item(0); if ($summary) { - return $summary->c14n(); + return $summary->nodeValue; } }