]> git.wh0rd.org - tt-rss.git/commitdiff
Revert "parser: use node->c14n() instead of expecting html in nodeValue"
authorAndrew Dolgov <noreply@fakecake.org>
Fri, 22 Jan 2016 22:24:13 +0000 (01:24 +0300)
committerAndrew Dolgov <noreply@fakecake.org>
Fri, 22 Jan 2016 22:24:13 +0000 (01:24 +0300)
This reverts commit 1383514ad9e7630a3d9627e052780b8fcadab25a.

classes/feeditem/atom.php
classes/feeditem/rss.php

index 7990a61c985dff0fac4d1ef160a8cd9a7aeed356..dfac7149f6cb4981cd6d768dd36e3600b80dd438 100644 (file)
@@ -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;
                }
 
        }
index 95f3acdebb5dbb2df9aba9837139bb2ffe2b6f38..27a364b812b90bb708b09b7f24d2e0803e06c40a 100644 (file)
@@ -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;
                }
        }