friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

The local directory is now using the template function as well

This commit is contained in:
Michael 2020-07-31 04:19:20 +00:00
parent 4842433449
commit a4b5536d17
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Module/Directory.php
View File

@ -29,7 +29,7 @@ use Friendica\Core\Hook;
use Friendica\Core\Session; use Friendica\Core\Session;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\DI; use Friendica\DI;
use Friendica\Model\Contact; use Friendica\Model;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Network\HTTPException; use Friendica\Network\HTTPException;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -83,7 +83,10 @@ class Directory extends BaseModule
} }
foreach ($profiles['entries'] as $entry) { foreach ($profiles['entries'] as $entry) {
$entries[] = self::formatEntry($entry, $photo); $contact = Model\Contact::getByURLForUser($entry['url'], local_user());
if (!empty($contact)) {
$entries[] = Contact::getContactTemplateVars($contact);
}
} }
} }
@ -160,18 +163,18 @@ class Directory extends BaseModule
$location_e = $location; $location_e = $location;
$photo_menu = [ $photo_menu = [
'profile' => [DI::l10n()->t("View Profile"), Contact::magicLink($profile_link)] 'profile' => [DI::l10n()->t("View Profile"), Model\Contact::magicLink($profile_link)]
]; ];
$entry = [ $entry = [
'id' => $contact['id'], 'id' => $contact['id'],
'url' => Contact::magicLink($profile_link), 'url' => Model\Contact::magicLink($profile_link),
'itemurl' => $itemurl, 'itemurl' => $itemurl,
'thumb' => Contact::getThumb($contact), 'thumb' => Model\Contact::getThumb($contact),
'img_hover' => $contact['name'], 'img_hover' => $contact['name'],
'name' => $contact['name'], 'name' => $contact['name'],
'details' => $details, 'details' => $details,
'account_type' => Contact::getAccountType($contact), 'account_type' => Model\Contact::getAccountType($contact),
'profile' => $profile, 'profile' => $profile,
'location' => $location_e, 'location' => $location_e,
'tags' => $contact['pub_keywords'], 'tags' => $contact['pub_keywords'],