add render_location hook to both sets of conversations
This commit is contained in:
parent
e242a391b9
commit
5859f9dcf6
|
@ -262,7 +262,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
else
|
else
|
||||||
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
|
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
|
||||||
|
|
||||||
$locate = array('location' => $item_location, 'coord' => $item['coord'], 'html' => '');
|
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
|
||||||
call_hooks('render_location',$locate);
|
call_hooks('render_location',$locate);
|
||||||
|
|
||||||
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
||||||
|
@ -589,16 +589,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
|
||||||
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
|
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
|
||||||
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
|
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
|
||||||
|
|
||||||
$location = (($item['location']) ? '<a target="map" title="' . $item['location']
|
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
|
||||||
. '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
|
call_hooks('render_location',$locate);
|
||||||
$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord']
|
|
||||||
. '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
|
$location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
|
||||||
if($coord) {
|
|
||||||
if($location)
|
|
||||||
$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
|
|
||||||
else
|
|
||||||
$location = '<span class="smalltext">' . $coord . '</span>';
|
|
||||||
}
|
|
||||||
|
|
||||||
$indent = (($toplevelpost) ? '' : ' comment');
|
$indent = (($toplevelpost) ? '' : ' comment');
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue