clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.5.1rc' into 1702-null-date

This commit is contained in:
Michael 2017-02-28 06:50:46 +00:00
parent 0afb0c2ea4 1046f2573c
commit 60adf67f13
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/discover_poco.php
View File

@ -186,6 +186,10 @@ function discover_directory($search) {
*/ */
function gs_search_user($search) { function gs_search_user($search) {
// Currently disabled, since the service isn't available anymore.
// It is not removed since I hope that there will be a successor.
return false;
$a = get_app(); $a = get_app();
$url = "http://gstools.org/api/users_search/".urlencode($search); $url = "http://gstools.org/api/users_search/".urlencode($search);

22
include/socgraph.php
View File

@ -1246,18 +1246,20 @@ function poco_discover_federation() {
poco_check_server("https://".$server->host); poco_check_server("https://".$server->host);
} }
// Discover GNU Social Servers // Currently disabled, since the service isn't available anymore.
if (!get_config('system','ostatus_disabled')) { // It is not removed since I hope that there will be a successor.
$serverdata = "http://gstools.org/api/get_open_instances/"; // Discover GNU Social Servers.
//if (!get_config('system','ostatus_disabled')) {
// $serverdata = "http://gstools.org/api/get_open_instances/";
$result = z_fetch_url($serverdata); // $result = z_fetch_url($serverdata);
if ($result["success"]) { // if ($result["success"]) {
$servers = json_decode($result["body"]); // $servers = json_decode($result["body"]);
foreach($servers->data AS $server) // foreach($servers->data AS $server)
poco_check_server($server->instance_address); // poco_check_server($server->instance_address);
} // }
} //}
set_config('poco','last_federation_discovery', time()); set_config('poco','last_federation_discovery', time());
} }