Merge remote-tracking branch 'upstream/develop' into write-tags

This commit is contained in:
Michael 2020-04-28 08:03:26 +00:00
commit 5367620467
8 changed files with 33 additions and 25 deletions

View file

@ -323,7 +323,7 @@ class Diaspora
*/
private static function verifyMagicEnvelope($envelope)
{
$basedom = XML::parseString($envelope);
$basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) {
Logger::log("Envelope is no XML file");
@ -449,7 +449,7 @@ class Diaspora
$xml = $raw;
}
$basedom = XML::parseString($xml);
$basedom = XML::parseString($xml, true);
if (!is_object($basedom)) {
Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);