tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #12472 from MrPetovan/bug/12466-profile-photos-aside

Browse source 
Remove VCard for owner in Profile\Photos module
This commit is contained in:
Tobias Diekershoff 2022-12-19 07:38:13 +01:00 committed by GitHub
commit 86a486f62b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Module/Profile/Photos.php
View file

@ -78,7 +78,7 @@ class Photos extends \Friendica\Module\BaseProfile
$this->systemMessages = $systemMessages; $this->systemMessages = $systemMessages;
$this->aclFormatter = $aclFormatter; $this->aclFormatter = $aclFormatter;
$owner = Profile::load($this->app, $this->parameters['nickname'] ?? ''); $owner = Profile::load($this->app, $this->parameters['nickname'] ?? '', false);
if (!$owner || $owner['account_removed'] || $owner['account_expired']) { if (!$owner || $owner['account_removed'] || $owner['account_expired']) {
throw new HTTPException\NotFoundException($this->t('User not found.')); throw new HTTPException\NotFoundException($this->t('User not found.'));
} }
@ -318,16 +318,8 @@ class Photos extends \Friendica\Module\BaseProfile
$owner_uid = $this->owner['uid']; $owner_uid = $this->owner['uid'];
$is_owner = $this->session->getLocalUserId() == $owner_uid; $is_owner = $this->session->getLocalUserId() == $owner_uid;
$remote_contact = false;
if ($this->session->getRemoteContactID($owner_uid)) {
$contact_id = $this->session->getRemoteContactID($owner_uid);
$contact = Contact::getContactForUser($contact_id, $owner_uid, ['blocked', 'pending']);
$remote_contact = $contact && !$contact['blocked'] && !$contact['pending'];
}
if ($this->owner['hidewall'] && !$this->session->isAuthenticated()) { if ($this->owner['hidewall'] && !$this->session->isAuthenticated()) {
$this->baseUrl->redirect('profile/' . $owner['nickname'] . '/restricted'); $this->baseUrl->redirect('profile/' . $this->owner['nickname'] . '/restricted');
} }
$this->session->set('photo_return', $this->args->getCommand()); $this->session->set('photo_return', $this->args->getCommand());
@ -412,6 +404,11 @@ class Photos extends \Friendica\Module\BaseProfile
]); ]);
} }
// Removing vCard for owner
if ($is_owner) {
$this->page['aside'] = '';
}
if (!empty($photo_albums_widget)) { if (!empty($photo_albums_widget)) {
$this->page['aside'] .= $photo_albums_widget; $this->page['aside'] .= $photo_albums_widget;
} }