Merge pull request #1916 from rabuzarus/geotag

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index cdd3118ce0bf226af917566b8216383c619020db..5a84ca42a635be89c7c0752a34d1612dd3c07ca9 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -597,7 +597,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
                                $locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
                                call_hooks('render_location',$locate);
 
-                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_google($locate));
+                               $location = ((strlen($locate['html'])) ? $locate['html'] : render_location_dummy($locate));
 
                                localize_item($item);
                                if($mode === 'network-new')
@@ -892,9 +892,9 @@ function item_photo_menu($item){
        foreach($menu as $k=>$v){
                if(strpos($v,'javascript:') === 0) {
                        $v = substr($v,11);
-                       $o .= "<li><a href=\"#\" onclick=\"$v\">$k</a></li>\n";
+                       $o .= "<li role=\"menuitem\"><a onclick=\"$v\">$k</a></li>\n";
                }
-               elseif ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
+               elseif ($v!="") $o .= "<li role=\"menuitem\"><a href=\"$v\">$k</a></li>\n";
        }
        return $o;
 }}
@@ -1229,14 +1229,10 @@ function find_thread_parent_index($arr,$x) {
        return false;
 }
 
-function render_location_google($item) {
-       $location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-       $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-       if($coord) {
-               if($location)
-                       $location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-               else
-                       $location = '<span class="smalltext">' . $coord . '</span>';
-       }
-       return $location;
+function render_location_dummy($item) {
+       if ($item['location'] != "")
+               return $item['location'];
+
+       if ($item['coord'] != "")
+               return $item['coord'];
 }