diff options
author | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2019-03-22 09:19:05 +0100 |
---|---|---|
committer | Benjamin Brahmer <info@b-brahmer.de> | 2019-03-22 09:19:05 +0100 |
commit | 62bd42cb17cefb3080f7aa61d4701acf1af7f412 (patch) | |
tree | b49526782aed98852230750e444ebb566a8ac9e5 /lib | |
parent | 730ce50b444f06286443a74b7e6cb1d627c5f014 (diff) |
Stop assuming encoding of xml, let simplexml throw silently (#457)
Diffstat (limited to 'lib')
-rw-r--r-- | lib/Db/Item.php | 1 | ||||
-rwxr-xr-x | lib/Fetcher/FeedFetcher.php | 4 |
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); |