Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-26 01:50:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael 2020-01-05 07:47:55 +00:00
commit 6ac37e284d
12 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Model/GContact.php
View file

@ -12,6 +12,7 @@ use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Search;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Network\Probe;
@ -508,7 +509,7 @@ class GContact
$done[] = DI::baseUrl() . '/poco';
if (strlen(Config::get('system', 'directory'))) {
$x = Network::fetchUrl(get_server() . '/pubsites');
$x = Network::fetchUrl(Search::getGlobalDirectory() . '/pubsites');
if (!empty($x)) {
$j = json_decode($x);
if (!empty($j->entries)) {

1
src/Model/GServer.php
View file

@ -10,6 +10,7 @@ use DOMDocument;
use DOMXPath;
use Friendica\Core\Config;
use Friendica\Core\Protocol;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Module\Register;
use Friendica\Network\CurlResult;