Improvements to microformats parsing.

simplepie · Oct 6, 2015 · ea469ed · ea469ed
1 parent a6e19f1
commit ea469ed
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/library/SimplePie/Parser.php b/library/SimplePie/Parser.php
@@ -418,7 +418,7 @@ private function parse_microformats(&$data, $url) {
 
 		$mf = Mf2\parse($data, $url);
 		foreach ($mf['items'] as $microformat) {
-			if ($microformat['type'][0] == 'h-entry') {
+			if (in_array('h-entry', $microformat['type'])) {
 				$entry = array();
 				if (isset($microformat['properties']['url'][0])) {
 					$link = $microformat['properties']['url'][0];
@@ -429,8 +429,12 @@ private function parse_microformats(&$data, $url) {
 					$entry['title'] = array(array('data' => $title));
 				}
 				if (isset($microformat['properties']['author'][0])) {
-					$author = htmlspecialchars($microformat['properties']['author'][0]);
-					$entry['author'] = array(array('data' => $author));
+					$author = $microformat['properties']['author'][0];
+					// author is a special case, it can be plain text or an h-card array.
+					if (is_array($author)) {
+						$author = isset($author['value']) ? $author['value'] : '';
+					}
+					$entry['author'] = array(array('data' => htmlspecialchars($author)));
 				}
 				if (isset($microformat['properties']['content'][0]['html'])) {
 					$description = $microformat['properties']['content'][0]['html'];