Add Twitter source debug to Debug\Babel

[friendica.git] / src / Module / Directory.php

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 7a6b65cf78f24881f65b497a6eda3b4b698036d4..3d03f10711935e17e1c755fddd62e240df823b56 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -51,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);
 
@@ -101,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'] . '<br />' : '');
+               $about = (($contact['about']) ? $contact['about'] . '<br />' : '');
 
                $details = '';
                if (strlen($contact['locality'])) {
@@ -138,7 +157,6 @@ class Directory extends BaseModule
                }
 
                $homepage = (!empty($profile['homepage']) ? DI::l10n()->t('Homepage:') : false);
-               $about =    (!empty($profile['about'])    ? DI::l10n()->t('About:')    : false);
 
                $location_e = $location;
 
@@ -158,9 +176,8 @@ class Directory extends BaseModule
                        'profile'      => $profile,
                        'location'     => $location_e,
                        'tags'         => $contact['pub_keywords'],
-                       'pdesc'        => $pdesc,
-                       'homepage'     => $homepage,
                        'about'        => $about,
+                       'homepage'     => $homepage,
                        'photo_menu'   => $photo_menu,
 
                ];