bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Use magicLink whenever possible

Browse source
This commit is contained in:
Michael 2018-06-02 08:05:06 +00:00
commit 8a34895a23
23 changed files with 61 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

7
mod/message.php
View file

@ -341,11 +341,8 @@ function message_content(App $a)
if ($message['from-url'] == $myprofile) {
$from_url = $myprofile;
$sparkle = '';
} elseif ($message['contact-id'] != 0) {
$from_url = 'redir/' . $message['contact-id'];
$sparkle = ' sparkle';
} else {
$from_url = $message['from-url'] . "?zrl=" . urlencode($myprofile);
$from_url = Contact::magicLink($message['from-url']);
$sparkle = ' sparkle';
}
@ -470,7 +467,7 @@ function render_messages(array $msg, $t)
$rslt .= replace_macros($tpl, [
'$id' => $rr['id'],
'$from_name' => $participants,
'$from_url' => (($rr['network'] === NETWORK_DFRN) ? 'redir/' . $rr['contact-id'] : $rr['url']),
'$from_url' => Contact::magicLink($rr['url']),
'$from_addr' => $contact['addr'],
'$sparkle' => ' sparkle',
'$from_photo' => proxy_url($from_photo, false, PROXY_SIZE_THUMB),