Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-05 23:04:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

Using getter/setter functions

Browse source
This commit is contained in:
Michael 2021-07-24 20:34:07 +00:00
parent b4aa796e75
commit 8f46064430
14 changed files with 55 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Model/Item.php
View file

@ -2685,7 +2685,7 @@ class Item
continue;
}
if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact_id) && ($item['network'] == Protocol::DFRN)) {
if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->getContactId()) && ($item['network'] == Protocol::DFRN)) {
$img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]);
$item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']);
}

10
src/Model/Profile.php
View file

@ -219,13 +219,13 @@ class Profile
return [];
}
$a->profile_owner = $profile['uid'];
$a->setProfileOwner($profile['uid']);
DI::page()['title'] = $profile['name'] . ' @ ' . DI::config()->get('config', 'sitename');
if (!DI::pConfig()->get(local_user(), 'system', 'always_my_theme')) {
$a->setCurrentTheme($profile['theme']);
$a->setCurrentMobileTheme(DI::pConfig()->get($a->profile_owner, 'system', 'mobile_theme'));
$a->setCurrentMobileTheme(DI::pConfig()->get($a->getProfileOwner(), 'system', 'mobile_theme'));
}
/*
@ -768,7 +768,7 @@ class Profile
Session::setVisitorsContacts();
$a->contact_id = $visitor['id'];
$a->setContactId($visitor['id']);
Logger::info('Authenticated visitor', ['url' => $visitor['url']]);
@ -829,7 +829,7 @@ class Profile
*/
Hook::callAll('magic_auth_success', $arr);
$a->contact_id = $arr['visitor']['id'];
$a->setContactId($arr['visitor']['id']);
info(DI::l10n()->t('OpenWebAuth: %1$s welcomes %2$s', DI::baseUrl()->getHostname(), $visitor['name']));
@ -871,7 +871,7 @@ class Profile
*/
public static function getThemeUid(App $a)
{
$uid = !empty($a->profile_owner) ? intval($a->profile_owner) : 0;
$uid = !empty($a->getProfileOwner()) ? intval($a->getProfileOwner()) : 0;
if (local_user() && (DI::pConfig()->get(local_user(), 'system', 'always_my_theme') || !$uid)) {
return local_user();
}