Merge remote-tracking branch 'upstream/develop' into item-move
This commit is contained in:
commit
bd9cb4595d
|
@ -1327,7 +1327,7 @@ class PortableContact
|
||||||
}
|
}
|
||||||
|
|
||||||
// Discover Friendica, Hubzilla and Diaspora servers
|
// Discover Friendica, Hubzilla and Diaspora servers
|
||||||
$serverdata = fetch_url("http://the-federation.info/pods.json");
|
$serverdata = Network::fetchUrl("http://the-federation.info/pods.json");
|
||||||
|
|
||||||
if ($serverdata) {
|
if ($serverdata) {
|
||||||
$servers = json_decode($serverdata);
|
$servers = json_decode($serverdata);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user