X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FDirectory.php;h=3d03f10711935e17e1c755fddd62e240df823b56;hb=da5045667527a84d6a3fd6efaee2fb97b9a49778;hp=9dec1ca23ada861d2f260570289638efbbea4698;hpb=5dfee31108fc92a7abca5f99b8fdf1b34aec5dd5;p=friendica.git
diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 9dec1ca23a..3d03f10711 100644
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -1,4 +1,23 @@
.
+ *
+ */
namespace Friendica\Module;
@@ -7,7 +26,6 @@ use Friendica\Content\Nav;
use Friendica\Content\Pager;
use Friendica\Content\Widget;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Session;
use Friendica\Core\Renderer;
use Friendica\DI;
@@ -52,7 +70,7 @@ class Directory extends BaseModule
$gDirPath = Profile::zrl($dirURL, true);
}
- $pager = new Pager(DI::args()->getQueryString(), 60);
+ $pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
$profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);
@@ -102,11 +120,11 @@ class Directory extends BaseModule
*/
public static function formatEntry(array $contact, $photo_size = 'photo')
{
- $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['profile_url']);
+ $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
- $profile_link = $contact['profile_url'];
+ $profile_link = $contact['url'];
- $pdesc = (($contact['pdesc']) ? $contact['pdesc'] . '
' : '');
+ $about = (($contact['about']) ? $contact['about'] . '
' : '');
$details = '';
if (strlen($contact['locality'])) {
@@ -138,10 +156,7 @@ class Directory extends BaseModule
$location = '';
}
- $gender = (!empty($profile['gender']) ? DI::l10n()->t('Gender:') : false);
- $marital = (!empty($profile['marital']) ? DI::l10n()->t('Status:') : false);
$homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
- $about = (!empty($profile['about']) ? DI::l10n()->t('About:') : false);
$location_e = $location;
@@ -161,11 +176,8 @@ class Directory extends BaseModule
'profile' => $profile,
'location' => $location_e,
'tags' => $contact['pub_keywords'],
- 'gender' => $gender,
- 'pdesc' => $pdesc,
- 'marital' => $marital,
- 'homepage' => $homepage,
'about' => $about,
+ 'homepage' => $homepage,
'photo_menu' => $photo_menu,
];