tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12435 from MrPetovan/bug/12344-calendar-profile-load

Browse source 
Apply calendar owner custom theme
This commit is contained in:
Philipp 2022-12-16 08:51:17 +01:00 committed by GitHub
parent 590f92ba42 777afb45fc
commit 63c661c783
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Calendar/Show.php
View file

@ -31,6 +31,7 @@ use Friendica\Core\Renderer;
use Friendica\Core\Session\Capability\IHandleUserSessions; use Friendica\Core\Session\Capability\IHandleUserSessions;
use Friendica\Core\Theme; use Friendica\Core\Theme;
use Friendica\Model\Event; use Friendica\Model\Event;
use Friendica\Model\Profile;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Module\BaseProfile; use Friendica\Module\BaseProfile;
use Friendica\Module\Response; use Friendica\Module\Response;
@ -68,7 +69,7 @@ class Show extends BaseModule
throw new HTTPException\UnauthorizedException(); throw new HTTPException\UnauthorizedException();
} }
$owner = User::getOwnerDataByNick($nickname); $owner = Profile::load($this->app, $nickname, false);
if (!$owner || $owner['account_expired'] || $owner['account_removed']) { if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
throw new HTTPException\NotFoundException($this->t('User not found.')); throw new HTTPException\NotFoundException($this->t('User not found.'));
} }
@ -102,8 +103,9 @@ class Show extends BaseModule
Nav::setSelected($is_owner ? 'home' : 'calendar'); Nav::setSelected($is_owner ? 'home' : 'calendar');
if (!$is_owner) { if ($is_owner) {
$this->page['aside'] .= Widget\VCard::getHTML($owner); // Removing the vCard added by Profile::load for owners
$this->page['aside'] = '';
} }
$this->page['aside'] .= Widget\CalendarExport::getHTML($owner['uid']); $this->page['aside'] .= Widget\CalendarExport::getHTML($owner['uid']);