Remove function prepare_text and use BBCode::convert() instead

This commit is contained in:
Philipp Holzer 2019-10-23 00:58:13 +02:00
parent 2c31916757
commit 9e94e8b48c
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
4 changed files with 16 additions and 29 deletions

View file

@ -911,7 +911,7 @@ class Event extends BaseObject
$tpl = Renderer::getMarkupTemplate('event_stream_item.tpl');
$return = Renderer::replaceMacros($tpl, [
'$id' => $item['event-id'],
'$title' => prepare_text($item['event-summary']),
'$title' => BBCode::convert($item['event-summary']),
'$dtstart_label' => L10n::t('Starts:'),
'$dtstart_title' => $dtstart_title,
'$dtstart_dt' => $dtstart_dt,
@ -929,7 +929,7 @@ class Event extends BaseObject
'$author_name' => $item['author-name'],
'$author_link' => $profile_link,
'$author_avatar' => $item['author-avatar'],
'$description' => prepare_text($item['event-desc']),
'$description' => BBCode::convert($item['event-desc']),
'$location_label' => L10n::t('Location:'),
'$show_map_label' => L10n::t('Show map'),
'$hide_map_label' => L10n::t('Hide map'),
@ -979,7 +979,7 @@ class Event extends BaseObject
}
}
$location['name'] = prepare_text($location['name']);
$location['name'] = BBCode::convert($location['name']);
// Construct the map HTML.
if (isset($location['address'])) {