Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 02:00:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'app-variables' of github.com:annando/friendica into app-variables

Browse source
This commit is contained in:
Michael 2021-07-25 05:08:33 +00:00
commit 9cc4682e0a
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
mod/display.php
View file

@ -122,15 +122,16 @@ function display_fetchauthor($item)
// Check for a repeated message
$shared = Item::getShareArray($item);
if (!empty($shared) && empty($shared['comment'])) {
$profiledata = [];
$profiledata['uid'] = -1;
$profiledata['id'] = -1;
$profiledata['nickname'] = '';
$profiledata['name'] = '';
$profiledata['picdate'] = '';
$profiledata['photo'] = '';
$profiledata['url'] = '';
$profiledata['network'] = '';
$profiledata = [
'uid' => -1,
'id' => -1,
'nickname' => '',
'name' => '',
'picdate' => '',
'photo' => '',
'url' => '',
'network' => '',
];
if (!empty($shared['author'])) {
$profiledata['name'] = $shared['author'];

2
mod/photos.php
View file

@ -1624,7 +1624,7 @@ function photos_content(App $a)
$o .= Renderer::replaceMacros($tpl, [
'$title' => DI::l10n()->t('Recent Photos'),
'$can_post' => $can_post,
'$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/'.$user['nickname'].'/upload'],
'$upload' => [DI::l10n()->t('Upload New Photos'), 'photos/' . $user['nickname'] . '/upload'],
'$photos' => $photos,
'$paginate' => $pager->renderFull($total),
]);

2
src/Module/Delegation.php
View file

@ -118,7 +118,7 @@ class Delegation extends BaseModule
throw new ForbiddenException(DI::l10n()->t('Permission denied.'));
}
$identities = User::identities(DI::session()->get('submanage') ?: local_user());
$identities = User::identities(DI::session()->get('submanage', local_user()));
//getting additinal information for each identity
foreach ($identities as $key => $identity) {

2
src/Module/Magic.php
View file

@ -65,7 +65,7 @@ class Magic extends BaseModule
$contact = DBA::selectFirst('contact', ['id', 'nurl', 'url'], ['id' => $cid]);
// Redirect if the contact is already authenticated on this site.
if (!empty($a->getContactId()) && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
if ($a->getContactId() && strpos($contact['nurl'], Strings::normaliseLink(DI::baseUrl()->get())) !== false) {
if ($test) {
$ret['success'] = true;
$ret['message'] .= 'Local site - you are already authenticated.' . EOL;