Merge pull request #8044 from annando/contact-adding

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

diff --git a/src/Module/Directory.php b/src/Module/Directory.php
index 7d75e4d477aa0f7cfa4ea5b2601b1074122d433a..41f27502875207eab78f8326ac7b452ca02f072f 100644 (file)
--- a/src/Module/Directory.php
+++ b/src/Module/Directory.php
@@ -10,6 +10,7 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Session;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Network\HTTPException;
@@ -21,10 +22,10 @@ use Friendica\Util\Strings;
  */
 class Directory extends BaseModule
 {
-       public static function content()
+       public static function content(array $parameters = [])
        {
-               $app = self::getApp();
-               $config = $app->getConfig();
+               $app = DI::app();
+               $config = DI::config();
 
                if (($config->get('system', 'block_public') && !Session::isAuthenticated()) ||
                        ($config->get('system', 'block_local_dir') && !Session::isAuthenticated())) {
@@ -32,11 +33,8 @@ class Directory extends BaseModule
                }
 
                if (local_user()) {
-                       $app->page['aside'] .= Widget::findPeople();
-                       $app->page['aside'] .= Widget::follow();
-               } else {
-                       unset($_SESSION['theme']);
-                       unset($_SESSION['mobile-theme']);
+                       DI::page()['aside'] .= Widget::findPeople();
+                       DI::page()['aside'] .= Widget::follow();
                }
 
                $output = '';
@@ -54,7 +52,7 @@ class Directory extends BaseModule
                        $gDirPath = Profile::zrl($dirURL, true);
                }
 
-               $pager = new Pager($app->query_string, 60);
+               $pager = new Pager(DI::args()->getQueryString(), 60);
 
                $profiles = Profile::searchProfiles($pager->getStart(), $pager->getItemsPerPage(), $search);