better support for atom content type xhtml

1 files changed, 12 insertions, 6 deletions

diff --git a/classes/feeditem/atom.php b/classes/feeditem/atom.php
index 1cfa4bcc5..73a586d5b 100644
--- a/classes/feeditem/atom.php
+++ b/classes/feeditem/atom.php
@@ -41,9 +41,8 @@ class FeedItem_Atom extends FeedItem_Common {
 		$content = $this->elem->getElementsByTagName("content")->item(0);
 
 		if ($content) {
-			if ($content->hasChildNodes()) {
-
-				if ($content->getElementsByTagName("*")->length > 1) {
+			if ($content->hasAttribute('type')) {
+				if ($content->getAttribute('type') == 'xhtml') {
 					return $this->doc->saveXML($content->firstChild->nextSibling);
 				}
 			}
@@ -53,11 +52,18 @@ class FeedItem_Atom extends FeedItem_Common {
 	}
 
 	function get_description() {
-		$summary = $this->elem->getElementsByTagName("summary")->item(0);
+		$content = $this->elem->getElementsByTagName("summary")->item(0);
+
+		if ($content) {
+			if ($content->hasAttribute('type')) {
+				if ($content->getAttribute('type') == 'xhtml') {
+					return $this->doc->saveXML($content->firstChild->nextSibling);
+				}
+			}
 
-		if ($summary) {
-			return $summary->nodeValue;
+			return $content->nodeValue;
 		}
+
 	}
 
 	function get_categories() {