Stop assuming encoding of xml, let simplexml throw silently (#457)

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/Db/Item.php b/lib/Db/Item.php
index 710f239d4..5491dff25 100644
--- a/lib/Db/Item.php
+++ b/lib/Db/Item.php
@@ -503,6 +503,7 @@ class Item extends Entity implements IAPI, \JsonSerializable
     {
         return (
             stripos($mime, 'audio/') !== false ||
+            stripos($mime, 'image/') !== false ||
             stripos($mime, 'video/') !== false);
     }
 }
diff --git a/lib/Fetcher/FeedFetcher.php b/lib/Fetcher/FeedFetcher.php
index bcf6081e3..7b78ae67d 100755
--- a/lib/Fetcher/FeedFetcher.php
+++ b/lib/Fetcher/FeedFetcher.php
@@ -208,11 +208,13 @@ class FeedFetcher implements IFeedFetcher
             'HTML-ENTITIES',
             mb_detect_encoding($body)
         );
+        libxml_use_internal_errors(true);
         $data = simplexml_load_string(
-            '<?xml version="1.0" encoding="utf-8"?><item>' . $body . '</item>',
+            "<?xml version=\"1.0\"?><item>$body</item>",
             SimpleXMLElement::class,
             LIBXML_NOCDATA
         );
+        libxml_clear_errors();
         $body = ($data === false) ? $body : (string) $data;
         $item->setBody($body);