mirror of
https://github.com/friendica/friendica
synced 2025-04-22 03:10:10 +00:00
Merge remote-tracking branch 'upstream/develop' into write-tags
This commit is contained in:
commit
8c44f535b7
7 changed files with 69 additions and 33 deletions
|
@ -120,9 +120,9 @@ class Directory extends BaseModule
|
|||
*/
|
||||
public static function formatEntry(array $contact, $photo_size = 'photo')
|
||||
{
|
||||
$itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['profile_url']);
|
||||
$itemurl = (($contact['addr'] != "") ? $contact['addr'] : $contact['url']);
|
||||
|
||||
$profile_link = $contact['profile_url'];
|
||||
$profile_link = $contact['url'];
|
||||
|
||||
$about = (($contact['about']) ? $contact['about'] . '<br />' : '');
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue