Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-12 04:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Move redundant System::removedBaseUrl() to DI::baseUrl()->remove() calls

Browse source
This commit is contained in:
nupplaPhil 2019-12-30 23:02:20 +01:00
parent 3f34229752
commit a4a7f19df1
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
6 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Content/ForumManager.php
View file

@ -9,8 +9,8 @@ use Friendica\Core\Protocol;
use Friendica\Content\Text\HTML;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Util\Proxy as ProxyUtils;
@ -116,7 +116,7 @@ class ForumManager
'name' => $contact['name'],
'cid' => $contact['id'],
'selected' => $selected,
'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
'micro' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
'id' => ++$id,
];
$entries[] = $entry;

4
src/Content/Widget/TagCloud.php
View file

@ -8,8 +8,8 @@ namespace Friendica\Content\Widget;
use Friendica\Core\L10n;
use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\DI;
use Friendica\Model\Item;
/**
@ -38,7 +38,7 @@ class TagCloud
$r = self::tagadelic($uid, $count, $owner_id, $flags, $type);
if (count($r)) {
$contact = DBA::selectFirst('contact', ['url'], ['uid' => $uid, 'self' => true]);
$url = System::removedBaseUrl($contact['url']);
$url = DI::baseUrl()->remove($contact['url']);
$tags = [];
foreach ($r as $rr) {