Merge pull request #11528 from annando/logruntime

[friendica.git] / src / Module / Contact / Conversations.php

diff --git a/src/Module/Contact/Conversations.php b/src/Module/Contact/Conversations.php
index 2c1cf91d6bc997f20f722d9fd057e5f8116f91f0..a8f6254739c56a33753811f0ce19cbffbca02ed3 100644 (file)
--- a/src/Module/Contact/Conversations.php
+++ b/src/Module/Contact/Conversations.php
@@ -1,8 +1,8 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
- * @license   GNU AGPL version 3 or any later version
+ * @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
@@ -32,8 +32,11 @@ use Friendica\Core\Protocol;
 use Friendica\Core\Theme;
 use Friendica\Model;
 use Friendica\Module\Contact;
+use Friendica\Module\Response;
 use Friendica\Module\Security\Login;
 use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Util\Profiler;
+use Psr\Log\LoggerInterface;
 
 /**
  *  Manages and show Contacts and their content
@@ -48,26 +51,21 @@ class Conversations extends BaseModule
         * @var Conversation
         */
        private $conversation;
-       /**
-        * @var App\BaseURL
-        */
-       private $baseUrl;
        /**
         * @var LocalRelationship
         */
        private $localRelationship;
 
-       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Page $page, Conversation $conversation, array $parameters = [])
+       public function __construct(L10n $l10n, LocalRelationship $localRelationship, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, App\Page $page, Conversation $conversation, array $server, array $parameters = [])
        {
-               parent::__construct($l10n, $parameters);
+               parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->page              = $page;
                $this->conversation      = $conversation;
-               $this->baseUrl           = $baseUrl;
                $this->localRelationship = $localRelationship;
        }
 
-       public function content(): string
+       protected function content(array $request = []): string
        {
                if (!local_user()) {
                        return Login::form($_SERVER['REQUEST_URI']);