Merge remote-tracking branch 'upstream/2022.09-rc' into worker-timeout

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 8d7b8611b64e1f03f09cf745f3a37b3a3297d673..9fac9db302c72fe4ba54969de63d41a58fb5c9b9 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -28,6 +28,7 @@ use Friendica\Content\Widget;
 use Friendica\Core\Hook;
 use Friendica\Core\Session;
 use Friendica\Core\Renderer;
+use Friendica\Core\Search;
 use Friendica\DI;
 use Friendica\Model;
 use Friendica\Model\Profile;
@@ -61,7 +62,7 @@ class Directory extends BaseModule
                $search = trim(rawurldecode($_REQUEST['search'] ?? ''));
 
                $gDirPath = '';
-               $dirURL = $config->get('system', 'directory');
+               $dirURL = Search::getGlobalDirectory();
                if (strlen($dirURL)) {
                        $gDirPath = Profile::zrl($dirURL, true);
                }
@@ -111,7 +112,7 @@ class Directory extends BaseModule
         *
         * @throws \Exception
         */
-       public static function formatEntry(array $contact, $photo_size = 'photo')
+       public static function formatEntry(array $contact, string $photo_size = 'photo'): array
        {
                $itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
 
@@ -165,7 +166,7 @@ class Directory extends BaseModule
                        'img_hover'    => $contact['name'],
                        'name'         => $contact['name'],
                        'details'      => $details,
-                       'account_type' => Model\Contact::getAccountType($contact['contact-type']),
+                       'account_type' => Model\Contact::getAccountType($contact['contact-type'] ?? 0),
                        'profile'      => $profile,
                        'location'     => $location_e,
                        'tags'         => $contact['pub_keywords'],