Set "convertForItem" at more places
This commit is contained in:
parent
dfe1d53342
commit
377bb78cc2
|
@ -650,11 +650,11 @@ class Contact extends BaseModule
|
||||||
'$profileurllabel'=> DI::l10n()->t('Profile URL'),
|
'$profileurllabel'=> DI::l10n()->t('Profile URL'),
|
||||||
'$profileurl' => $contact['url'],
|
'$profileurl' => $contact['url'],
|
||||||
'$account_type' => Model\Contact::getAccountType($contact),
|
'$account_type' => Model\Contact::getAccountType($contact),
|
||||||
'$location' => BBCode::convert($contact['location']),
|
'$location' => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['location']),
|
||||||
'$location_label' => DI::l10n()->t('Location:'),
|
'$location_label' => DI::l10n()->t('Location:'),
|
||||||
'$xmpp' => BBCode::convert($contact['xmpp']),
|
'$xmpp' => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['xmpp']),
|
||||||
'$xmpp_label' => DI::l10n()->t('XMPP:'),
|
'$xmpp_label' => DI::l10n()->t('XMPP:'),
|
||||||
'$about' => BBCode::convert($contact['about'], false),
|
'$about' => BBCode::convertForItem($contact['uri-id'] ?? 0, $contact['about'], BBCode::EXTERNAL),
|
||||||
'$about_label' => DI::l10n()->t('About:'),
|
'$about_label' => DI::l10n()->t('About:'),
|
||||||
'$keywords' => $contact['keywords'],
|
'$keywords' => $contact['keywords'],
|
||||||
'$keywords_label' => DI::l10n()->t('Tags:'),
|
'$keywords_label' => DI::l10n()->t('Tags:'),
|
||||||
|
|
|
@ -111,7 +111,7 @@ class Account extends BaseDataTransferObject
|
||||||
$created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated;
|
$created = $userContactCreated < $publicContactCreated && ($userContactCreated != DBA::NULL_DATETIME) ? $userContactCreated : $publicContactCreated;
|
||||||
$this->created_at = DateTimeFormat::utc($created, DateTimeFormat::JSON);
|
$this->created_at = DateTimeFormat::utc($created, DateTimeFormat::JSON);
|
||||||
|
|
||||||
$this->note = BBCode::convertForItem($publicContact['uri-id'] ?? 0, $publicContact['about'], BBCode::API);
|
$this->note = BBCode::convertForItem($publicContact['uri-id'] ?? 0, $publicContact['about'], BBCode::EXTERNAL);
|
||||||
$this->url = $publicContact['url'];
|
$this->url = $publicContact['url'];
|
||||||
$this->avatar = Contact::getAvatarUrlForId($userContact['id'] ?? 0 ?: $publicContact['id'], Proxy::SIZE_SMALL, $userContact['updated'] ?? '' ?: $publicContact['updated']);
|
$this->avatar = Contact::getAvatarUrlForId($userContact['id'] ?? 0 ?: $publicContact['id'], Proxy::SIZE_SMALL, $userContact['updated'] ?? '' ?: $publicContact['updated']);
|
||||||
$this->avatar_static = $this->avatar;
|
$this->avatar_static = $this->avatar;
|
||||||
|
|
|
@ -131,7 +131,7 @@ class Status extends BaseDataTransferObject
|
||||||
$this->muted = $userAttributes->muted;
|
$this->muted = $userAttributes->muted;
|
||||||
$this->bookmarked = $userAttributes->bookmarked;
|
$this->bookmarked = $userAttributes->bookmarked;
|
||||||
$this->pinned = $userAttributes->pinned;
|
$this->pinned = $userAttributes->pinned;
|
||||||
$this->content = BBCode::convertForItem($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::API);
|
$this->content = BBCode::convertForItem($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::EXTERNAL);
|
||||||
$this->reblog = $reblog;
|
$this->reblog = $reblog;
|
||||||
$this->application = $application->toArray();
|
$this->application = $application->toArray();
|
||||||
$this->account = $account->toArray();
|
$this->account = $account->toArray();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user