X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FAllFriends.php;h=e145614982274a50d4741c29ba4ba5d96e5ed5a8;hb=5d20cd7e1698b2fddf68b3de610581676dbf572f;hp=b0e6ea1490bcf00bc519be5061ef80a39a73631c;hpb=d48b100f789aa629578eac5f962726066494366e;p=friendica.git

diff --git a/src/Module/AllFriends.php b/src/Module/AllFriends.php
index b0e6ea1490..e145614982 100644
--- a/src/Module/AllFriends.php
+++ b/src/Module/AllFriends.php
@@ -7,6 +7,7 @@ use Friendica\Content\ContactSelector;
 use Friendica\Content\Pager;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Proxy as ProxyUtils;
@@ -16,9 +17,9 @@ use Friendica\Util\Proxy as ProxyUtils;
  */
 class AllFriends extends BaseModule
 {
-	public static function content()
+	public static function content(array $parameters = [])
 	{
-		$app = self::getApp();
+		$app = DI::app();
 
 		if (!local_user()) {
 			throw new HTTPException\ForbiddenException();
@@ -43,12 +44,12 @@ class AllFriends extends BaseModule
 			throw new HTTPException\BadRequestException(L10n::t('Invalid contact.'));
 		}
 
-		$app->page['aside'] = "";
+		DI::page()['aside'] = "";
 		Model\Profile::load($app, "", 0, Model\Contact::getDetailsByURL($contact["url"]));
 
 		$total = Model\GContact::countAllFriends(local_user(), $cid);
 
-		$pager = new Pager($app->query_string);
+		$pager = new Pager(DI::args()->getQueryString());
 
 		$friends = Model\GContact::allFriends(local_user(), $cid, $pager->getStart(), $pager->getItemsPerPage());
 		if (empty($friends)) {
@@ -69,7 +70,7 @@ class AllFriends extends BaseModule
 				$friend['id'] = $friend['cid'];
 				$photoMenu = Model\Contact::photoMenu($friend);
 			} else {
-				$connlnk = $app->getBaseURL() . '/follow/?url=' . $friend['url'];
+				$connlnk = DI::baseUrl()->get() . '/follow/?url=' . $friend['url'];
 				$photoMenu = [
 					'profile' => [L10n::t('View Profile'), Model\Contact::magicLinkbyId($friend['id'], $friend['url'])],
 					'follow'  => [L10n::t('Connect/Follow'), $connlnk]
@@ -78,7 +79,7 @@ class AllFriends extends BaseModule
 
 			$entry = [
 				'url'          => Model\Contact::magicLinkbyId($friend['id'], $friend['url']),
-				'itemurl'      => defaults($contactDetails, 'addr', $friend['url']),
+				'itemurl'      => ($contactDetails['addr'] ?? '') ?: $friend['url'],
 				'name'         => $contactDetails['name'],
 				'thumb'        => ProxyUtils::proxifyUrl($contactDetails['thumb'], false, ProxyUtils::SIZE_THUMB),
 				'img_hover'    => $contactDetails['name'],