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

Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

Browse source
This commit is contained in:
nupplaPhil 2019-12-16 00:47:24 +01:00
parent 2900389696
commit 50be94aa5e
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
23 changed files with 34 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Protocol/Feed.php
View file

@ -13,6 +13,7 @@ use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\ParseUrl;
@ -465,7 +466,7 @@ class Feed {
// Distributed items should have a well formatted URI.
// Additionally we have to avoid conflicts with identical URI between imported feeds and these items.
if ($notify) {
$item['guid'] = Item::guidFromUri($orig_plink, $a->getHostName());
$item['guid'] = Item::guidFromUri($orig_plink, DI::baseUrl()->getHostname()());
unset($item['uri']);
unset($item['parent-uri']);

3
src/Protocol/OStatus.php
View file

@ -17,6 +17,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
@ -1846,7 +1847,7 @@ class OStatus
}
$item["uri"] = $item['parent-uri'] = $item['thr-parent']
= 'tag:'.get_app()->getHostName().
= 'tag:' . DI::baseUrl()->getHostname()().
','.date('Y-m-d').':'.$action.':'.$owner['uid'].
':person:'.$connect_id.':'.$item['created'];