try to force-convert feed data to utf8

1 files changed, 16 insertions, 1 deletions

diff --git a/classes/feedparser.php b/classes/feedparser.php
index bd67ca39d..6b84e59c7 100644
--- a/classes/feedparser.php
+++ b/classes/feedparser.php
@@ -17,7 +17,22 @@ class FeedParser {
 		libxml_clear_errors();
 		$this->doc = new DOMDocument();
 		$this->doc->loadXML($data);
-		$this->error = $this->format_error(libxml_get_last_error());
+
+		$error = libxml_get_last_error();
+
+		if ($error && $error->code == 9) {
+			libxml_clear_errors();
+
+			// we might want to try guessing input encoding here too
+			$data = iconv("UTF-8", "UTF-8//IGNORE", $data);
+
+			$this->doc = new DOMDocument();
+			$this->doc->loadXML($data);
+
+			$error = libxml_get_last_error();
+		}
+
+		$this->error = $this->format_error($error);
 		libxml_clear_errors();
 
 		$this->items = array();