From 68c65af0466daa53ebdec4edee18095bbac48abe Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 15 Jun 2019 08:44:36 -0400 Subject: [PATCH 1/2] Remove unused Module\Directory::init method --- src/Module/Directory.php | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/Module/Directory.php b/src/Module/Directory.php index cdf43b8f95..667f08616f 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -20,19 +20,6 @@ use Friendica\Util\Strings; */ class Directory extends BaseModule { - public static function init() - { - $app = self::getApp(); - - if (local_user()) { - $app->page['aside'] .= Widget::findPeople(); - $app->page['aside'] .= Widget::follow(); - } else { - unset($_SESSION['theme']); - unset($_SESSION['mobile-theme']); - } - } - public static function content() { $app = self::getApp(); @@ -43,6 +30,14 @@ class Directory extends BaseModule throw new HTTPException\ForbiddenException(L10n::t('Public access denied.')); } + if (local_user()) { + $app->page['aside'] .= Widget::findPeople(); + $app->page['aside'] .= Widget::follow(); + } else { + unset($_SESSION['theme']); + unset($_SESSION['mobile-theme']); + } + $output = ''; $entries = []; @@ -157,7 +152,7 @@ class Directory extends BaseModule $entry = [ 'id' => $contact['id'], - 'url' => Contact::magicLInk($profile_link), + 'url' => Contact::magicLink($profile_link), 'itemurl' => $itemurl, 'thumb' => ProxyUtils::proxifyUrl($contact[$photo_size], false, ProxyUtils::SIZE_THUMB), 'img_hover' => $contact['name'], From 394159d41e140fbf2f3c87245742fa37dbb43c0a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 15 Jun 2019 08:44:55 -0400 Subject: [PATCH 2/2] Use correct entry list in Module\Directory --- src/Module/Directory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Directory.php b/src/Module/Directory.php index 667f08616f..4674a9f857 100644 --- a/src/Module/Directory.php +++ b/src/Module/Directory.php @@ -78,7 +78,7 @@ class Directory extends BaseModule '$globaldir' => L10n::t('Global Directory'), '$gDirPath' => $gDirPath, '$desc' => L10n::t('Find on this site'), - '$contacts' => $profiles['entries'], + '$contacts' => $entries, '$finding' => L10n::t('Results for:'), '$findterm' => (strlen($search) ? $search : ""), '$title' => L10n::t('Site Directory'),