kopia lustrzana https://github.com/friendica/friendica
Merge pull request #3868 from rabuzarus/20171104_-_use_best_link_url_for_events
events: use best_link_url() and zrl() for creating the author_link (author link as magic-link)pull/3871/head
commit
57f114d7e1
|
@ -971,6 +971,14 @@ function format_event_item($item) {
|
||||||
$location['map'] = '<div class="map">' . generate_map(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
|
$location['map'] = '<div class="map">' . generate_map(str_replace('/', ' ', $evloc['coordinates'])) . '</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Construct the profile link (magic-auth).
|
||||||
|
$sp = false;
|
||||||
|
$profile_link = best_link_url($item, $sp);
|
||||||
|
|
||||||
|
if (!$sp) {
|
||||||
|
$profile_link = zrl($profile_link);
|
||||||
|
}
|
||||||
|
|
||||||
$event = replace_macros(get_markup_template('event_stream_item.tpl'), array(
|
$event = replace_macros(get_markup_template('event_stream_item.tpl'), array(
|
||||||
'$id' => $item['event-id'],
|
'$id' => $item['event-id'],
|
||||||
'$title' => prepare_text($item['event-summary']),
|
'$title' => prepare_text($item['event-summary']),
|
||||||
|
@ -989,9 +997,9 @@ function format_event_item($item) {
|
||||||
'$end_time' => $end_time,
|
'$end_time' => $end_time,
|
||||||
'$end_short' => $end_short,
|
'$end_short' => $end_short,
|
||||||
'$author_name' => $item['author-name'],
|
'$author_name' => $item['author-name'],
|
||||||
'$author_link' => $item['author-link'],
|
'$author_link' => $profile_link,
|
||||||
'$author_avatar' => $item['author-avatar'],
|
'$author_avatar' => $item['author-avatar'],
|
||||||
'$description' => prepare_text($item['event-desc']),
|
'$description' => prepare_text($item['event-desc']),
|
||||||
'$location_label' => t('Location:'),
|
'$location_label' => t('Location:'),
|
||||||
'$show_map_label' => t('Show map'),
|
'$show_map_label' => t('Show map'),
|
||||||
'$hide_map_label' => t('Hide map'),
|
'$hide_map_label' => t('Hide map'),
|
||||||
|
|
Ładowanie…
Reference in New Issue