mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #10822 from MrPetovan/bug/fatal-errors

Browse source 
Trim XML before emptiness check in Protocol\Feed::import
This commit is contained in:
Michael Vogel 2021-10-04 08:17:35 +02:00 committed by GitHub
parent 6275159761 a4706e9521
commit 2a8d8d402c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Protocol/Feed.php
View file

@ -69,6 +69,8 @@ class Feed
Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]); Logger::info("Import Atom/RSS feed '" . $contact["name"] . "' (Contact " . $contact["id"] . ") for user " . $importer["uid"]);
} }
$xml = trim($xml);
if (empty($xml)) { if (empty($xml)) {
Logger::info('XML is empty.'); Logger::info('XML is empty.');
return []; return [];
@ -83,7 +85,7 @@ class Feed
} }
$doc = new DOMDocument(); $doc = new DOMDocument();
@$doc->loadXML(trim($xml)); @$doc->loadXML($xml);
$xpath = new DOMXPath($doc); $xpath = new DOMXPath($doc);
$xpath->registerNamespace('atom', ActivityNamespace::ATOM1); $xpath->registerNamespace('atom', ActivityNamespace::ATOM1);
$xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/"); $xpath->registerNamespace('dc', "http://purl.org/dc/elements/1.1/");