Merge branch '2019.01-rc' into bug/6334-escape-get-app

This commit is contained in:
Hypolite Petovan 2019-01-06 16:38:48 -05:00 committed by GitHub
commit e447375cdd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 136 additions and 72 deletions

View file

@ -1326,15 +1326,8 @@ class Diaspora
$x = false;
}
// This will work for older Diaspora and Friendica servers
if (!$x) {
$source_url = $server."/p/".urlencode($guid).".xml";
Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
$x = Network::fetchUrl($source_url);
if (!$x) {
return false;
}
return false;
}
$source_xml = XML::parseString($x);