Merge remote-tracking branch 'upstream/develop' into app-user2

This commit is contained in:
Michael 2021-08-09 15:32:32 +00:00
commit 4495e83eca
36 changed files with 446 additions and 312 deletions

View file

@ -607,6 +607,8 @@ class Contact extends BaseModule
'$location_label' => DI::l10n()->t('Location:'),
'$xmpp' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['xmpp']),
'$xmpp_label' => DI::l10n()->t('XMPP:'),
'$matrix' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['matrix']),
'$matrix_label' => DI::l10n()->t('Matrix:'),
'$about' => BBCode::convertForUriId($contact['uri-id'] ?? 0, $contact['about'], BBCode::EXTERNAL),
'$about_label' => DI::l10n()->t('About:'),
'$keywords' => $contact['keywords'],