Merge remote-tracking branch 'upstream/develop' into inbox-gsid

[friendica.git] / src / Module / Item / Compose.php

diff --git a/src/Module/Item/Compose.php b/src/Module/Item/Compose.php
index 41d55ad3541ae65d6166f29c21c5e5565bfd02b7..d44fe2cd7d84e0133ebcac06a7b059dd9e9b3487 100644 (file)
--- a/src/Module/Item/Compose.php
+++ b/src/Module/Item/Compose.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
  *
@@ -31,7 +31,6 @@ use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Core\Theme;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -89,7 +88,7 @@ class Compose extends BaseModule
 
        protected function content(array $request = []): string
        {
-               if (!Session::getLocalUser()) {
+               if (!DI::userSession()->getLocalUserId()) {
                        return Login::form('compose');
                }
 
@@ -111,7 +110,7 @@ class Compose extends BaseModule
                        }
                }
 
-               $user = User::getById(Session::getLocalUser(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
+               $user = User::getById(DI::userSession()->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'default-location']);
 
                $contact_allow_list = $this->ACLFormatter->expand($user['allow_cid']);
                $group_allow_list   = $this->ACLFormatter->expand($user['allow_gid']);
@@ -168,7 +167,7 @@ class Compose extends BaseModule
 
                $contact = Contact::getById($a->getContactId());
 
-               if ($this->pConfig->get(Session::getLocalUser(), 'system', 'set_creation_date')) {
+               if ($this->pConfig->get(DI::userSession()->getLocalUserId(), 'system', 'set_creation_date')) {
                        $created_at = Temporal::getDateTimeField(
                                new \DateTime(DBA::NULL_DATETIME),
                                new \DateTime('now'),
@@ -204,8 +203,8 @@ class Compose extends BaseModule
                                'location_disabled'    => $this->l10n->t('Location services are disabled. Please check the website\'s permissions on your device'),
                                'wait'                 => $this->l10n->t('Please wait'),
                                'placeholdertitle'     => $this->l10n->t('Set title'),
-                               'placeholdercategory'  => Feature::isEnabled(Session::getLocalUser(),'categories') ? $this->l10n->t('Categories (comma-separated list)') : '',
-                               'always_open_compose'  => $this->pConfig->get(Session::getLocalUser(), 'frio', 'always_open_compose',
+                               'placeholdercategory'  => Feature::isEnabled(DI::userSession()->getLocalUserId(),'categories') ? $this->l10n->t('Categories (comma-separated list)') : '',
+                               'always_open_compose'  => $this->pConfig->get(DI::userSession()->getLocalUserId(), 'frio', 'always_open_compose',
                                        $this->config->get('frio', 'always_open_compose', false)) ? '' :
                                                $this->l10n->t('You can make this page always open when you use the New Post button in the <a href="/settings/display">Theme Customization settings</a>.'),
                        ],