keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace unwarranted uses of $a->data['contact']

Browse source
This commit is contained in:
Hypolite Petovan 2018-10-14 18:25:44 -04:00
parent 57e8fb5cb1
commit 12ddb3bb54
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Module/Contact.php
View file

@ -72,21 +72,21 @@ class Contact extends BaseModule
$a->data['contact'] = $contact; $a->data['contact'] = $contact;
if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != Protocol::DFRN)) { if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) {
$networkname = format_network_name($a->data['contact']['network'], $a->data['contact']['url']); $networkname = format_network_name($contact['network'], $contact['url']);
} else { } else {
$networkname = ''; $networkname = '';
} }
/// @TODO Add nice spaces /// @TODO Add nice spaces
$vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [ $vcard_widget = replace_macros(get_markup_template('vcard-widget.tpl'), [
'$name' => htmlentities($a->data['contact']['name']), '$name' => htmlentities($contact['name']),
'$photo' => $a->data['contact']['photo'], '$photo' => $contact['photo'],
'$url' => Model\Contact::MagicLink($a->data['contact']['url']), '$url' => Model\Contact::MagicLink($contact['url']),
'$addr' => defaults($contact, 'addr', ''), '$addr' => defaults($contact, 'addr', ''),
'$network_name' => $networkname, '$network_name' => $networkname,
'$network' => L10n::t('Network:'), '$network' => L10n::t('Network:'),
'$account_type' => Model\Contact::getAccountType($a->data['contact']) '$account_type' => Model\Contact::getAccountType($contact)
]); ]);
$findpeople_widget = ''; $findpeople_widget = '';