Merge remote-tracking branch 'upstream/develop' into write-tags

This commit is contained in:
Michael 2020-04-29 02:38:33 +00:00
commit 8c44f535b7
7 changed files with 69 additions and 33 deletions

View file

@ -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 />' : '');