tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Remove get_server() in favor of Search::getGlobalDirectory()

Browse source
This commit is contained in:
Philipp Holzer 2020-01-04 23:59:20 +01:00
commit 48baa0be4b
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
10 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/dfrn_request.php
View file

@ -18,6 +18,7 @@ use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\Core\System;
use Friendica\Core\Session;
use Friendica\Database\DBA;
@ -634,7 +635,7 @@ function dfrn_request_content(App $a)
$page_desc = L10n::t("Please enter your 'Identity Address' from one of the following supported communications networks:");
$invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', get_server() . '/servers');
$invite_desc = L10n::t('If you are not yet a member of the free social web, <a href="%s">follow this link to find a public Friendica site and join us today</a>.', Search::getGlobalDirectory() . '/servers');
$o = Renderer::replaceMacros($tpl, [
'$header' => L10n::t('Friend/Connection Request'),

5
mod/match.php
View file

@ -8,6 +8,7 @@ use Friendica\Content\Widget;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\Search;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
@ -56,7 +57,7 @@ function match_content(App $a)
$params['n'] = 100;
if (strlen(Config::get('system', 'directory'))) {
$host = get_server();
$host = Search::getGlobalDirectory();
} else {
$host = DI::baseUrl();
}
@ -79,7 +80,7 @@ function match_content(App $a)
}
// Workaround for wrong directory photo URL
$profile->photo = str_replace('http:///photo/', get_server() . '/photo/', $profile->photo);
$profile->photo = str_replace('http:///photo/', Search::getGlobalDirectory() . '/photo/', $profile->photo);
$connlnk = DI::baseUrl() . '/follow/?url=' . $profile->url;
$photo_menu = [