Merge remote-tracking branch 'upstream/develop' into baseurl

[friendica.git] / src / Object / Thread.php

diff --git a/src/Object/Thread.php b/src/Object/Thread.php
index a628749001ce0149f981f4e27760c32bc5098e21..adc822b6ad456af419fffe6b7a5da09fe26234b7 100644 (file)
--- a/src/Object/Thread.php
+++ b/src/Object/Thread.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -23,7 +23,6 @@ namespace Friendica\Object;
 
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
-use Friendica\Core\Session;
 use Friendica\DI;
 use Friendica\Protocol\Activity;
 use Friendica\Security\Security;
@@ -76,7 +75,7 @@ class Thread
                switch ($mode) {
                        case 'network':
                        case 'notes':
-                               $this->profile_owner = Session::getLocalUser();
+                               $this->profile_owner = DI::userSession()->getLocalUserId();
                                $this->writable = true;
                                break;
                        case 'profile':
@@ -169,7 +168,7 @@ class Thread
                /*
                 * Only add will be displayed
                 */
-               if ($item->getDataValue('network') === Protocol::MAIL && Session::getLocalUser() != $item->getDataValue('uid')) {
+               if ($item->getDataValue('network') === Protocol::MAIL && DI::userSession()->getLocalUserId() != $item->getDataValue('uid')) {
                        Logger::info('[WARN] Conversation::addThread : Thread is a mail ('. $item->getId() .').');
                        return false;
                }
@@ -191,18 +190,18 @@ class Thread
         * We should find a way to avoid using those arguments (at least most of them)
         *
         * @param array $conv_responses data
-        * @param string $formSecurityToken A security Token to avoid CSF attacks
+        * @param string $formSecurityToken A 'contact_action' form security token
         *
         * @return mixed The data requested on success
         *               false on failure
         * @throws \Exception
         */
-       public function getTemplateData($conv_responses, string $formSecurityToken)
+       public function getTemplateData(array $conv_responses, string $formSecurityToken)
        {
                $result = [];
 
                foreach ($this->parents as $item) {
-                       if ($item->getDataValue('network') === Protocol::MAIL && Session::getLocalUser() != $item->getDataValue('uid')) {
+                       if ($item->getDataValue('network') === Protocol::MAIL && DI::userSession()->getLocalUserId() != $item->getDataValue('uid')) {
                                continue;
                        }