Changes:

[friendica.git] / src / Module / Calendar / Show.php

diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php
index 9a3e768ecceb3670d71d4db645ec6de5ad3e97fa..11b402760d9450f2d530950a62f4cf9cda1089d4 100644 (file)
--- a/src/Module/Calendar/Show.php
+++ b/src/Module/Calendar/Show.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -31,6 +31,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Core\Theme;
 use Friendica\Model\Event;
+use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\BaseProfile;
 use Friendica\Module\Response;
@@ -63,12 +64,12 @@ class Show extends BaseModule
 
        protected function content(array $request = []): string
        {
-               $nickname = $this->parameters['nickname'] ?? $this->app->getLoggedInUserNickname();
+               $nickname = $this->parameters['nickname'] ?? $this->session->getLocalUserNickname();
                if (!$nickname) {
                        throw new HTTPException\UnauthorizedException();
                }
 
-               $owner = User::getOwnerDataByNick($nickname);
+               $owner = Profile::load($this->app, $nickname, false);
                if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }
@@ -102,8 +103,9 @@ class Show extends BaseModule
 
                Nav::setSelected($is_owner ? 'home' : 'calendar');
 
-               if (!$is_owner) {
-                       $this->page['aside'] .= Widget\VCard::getHTML($owner);
+               if ($is_owner) {
+                       // Removing the vCard added by Profile::load for owners
+                       $this->page['aside'] = '';
                }
 
                $this->page['aside'] .= Widget\CalendarExport::getHTML($owner['uid']);