From bc3c887f4f1c0fd1b9a0a2bd290980683988106e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 20 Jun 2013 21:16:06 +0400 Subject: [PATCH] better root element detection for atom content type xhtml (closes #720) --- classes/feeditem/atom.php | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php index 9680748f..fa6b3a34 100644 --- a/classes/feeditem/atom.php +++ b/classes/feeditem/atom.php @@ -58,7 +58,13 @@ class FeedItem_Atom extends FeedItem_Common { if ($content) { if ($content->hasAttribute('type')) { if ($content->getAttribute('type') == 'xhtml') { - return $this->doc->saveXML($content->firstChild->nextSibling); + for ($i = 0; $i < $content->childNodes->length; $i++) { + $child = $content->childNodes->item($i); + + if ($child->hasChildNodes()) { + return $this->doc->saveXML($child); + } + } } } @@ -72,7 +78,13 @@ class FeedItem_Atom extends FeedItem_Common { if ($content) { if ($content->hasAttribute('type')) { if ($content->getAttribute('type') == 'xhtml') { - return $this->doc->saveXML($content->firstChild->nextSibling); + for ($i = 0; $i < $content->childNodes->length; $i++) { + $child = $content->childNodes->item($i); + + if ($child->hasChildNodes()) { + return $this->doc->saveXML($child); + } + } } } -- 2.39.2