diff options
author | Andrew Dolgov <[email protected]> | 2016-01-23 01:24:13 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2016-01-23 01:24:13 +0300 |
commit | d2bb392bae5d3de97e1e99bc810524e149c5c199 (patch) | |
tree | 0006d0056ca223b6229589036ce85cd049073e81 /classes | |
parent | 1383514ad9e7630a3d9627e052780b8fcadab25a (diff) |
Revert "parser: use node->c14n() instead of expecting html in nodeValue"
This reverts commit 1383514ad9e7630a3d9627e052780b8fcadab25a.
Diffstat (limited to 'classes')
-rw-r--r-- | classes/feeditem/atom.php | 4 | ||||
-rw-r--r-- | classes/feeditem/rss.php | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php index 7990a61c9..dfac7149f 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 95f3acdeb..27a364b81 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; } } |