diff options
| author | friendica <info@friendica.com> | 2013-02-02 16:34:00 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-02-02 16:34:00 -0800 |
| commit | b41106f2fbebfd0bbc2bfc70efd3421073469f44 (patch) | |
| tree | 9412d4081bf49dfe5a2e064047cabc633a65fde6 /include/ItemObject.php | |
| parent | 09ece497f7211bf65aa026894fec22dd1605a20c (diff) | |
| download | volse-hubzilla-b41106f2fbebfd0bbc2bfc70efd3421073469f44.tar.gz volse-hubzilla-b41106f2fbebfd0bbc2bfc70efd3421073469f44.tar.bz2 volse-hubzilla-b41106f2fbebfd0bbc2bfc70efd3421073469f44.zip | |
allow non-linkable locations, self-linked locations and get rid of google default location link
Diffstat (limited to 'include/ItemObject.php')
| -rw-r--r-- | include/ItemObject.php | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index c4f1093c6..d3d2b7283 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -135,16 +135,8 @@ class Item extends BaseObject { $profile_link = chanlink_url($item['author']['xchan_url']); $profile_name = $item['author']['xchan_name']; - $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => ''); - call_hooks('render_location',$locate); - $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate)); - -// are we still using $item['tag']? Need to check... - $tags = array(); - foreach(explode(',',$item['tag']) as $tag){ - $tag = trim($tag); - if ($tag!="") $tags[] = bbcode($tag); - } + $location = format_location($item); + $showlike = ((x($alike,$item['uri'])) ? format_like($alike[$item['uri']],$alike[$item['uri'] . '-l'],'like',$item['uri']) : ''); $showdislike = ((x($dlike,$item['uri']) && feature_enabled($conv->get_profile_owner(),'dislike')) @@ -200,7 +192,7 @@ class Item extends BaseObject { 'template' => $this->get_template(), 'type' => implode("",array_slice(explode("/",$item['verb']),-1)), - 'tags' => $tags, + 'tags' => array(), 'body' => $body, 'text' => strip_tags($body), 'id' => $this->get_id(), |