friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into item-move

This commit is contained in:
Michael 2018-01-28 14:05:39 +00:00
parent 7b27dda784 f777dd8d70
commit bd9cb4595d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Protocol/PortableContact.php
View File

@ -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);