Removed Google Maps

diff --git a/include/conversation.php b/include/conversation.php
index cdd3118ce0bf226af917566b8216383c619020db..4aae611804cb7f0ebdf99856554293fc3f934c05 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')
@@ -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'];
 }

diff --git a/mod/content.php b/mod/content.php
index e20345307d9b9b74644485e7bc5d5df3dbcbef8f..cec23a91421ad4a23eaea3e78b896581878fb86e 100644 (file)
--- a/mod/content.php
+++ b/mod/content.php
@@ -425,7 +425,7 @@ function render_content(&$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')
@@ -799,7 +799,7 @@ function render_content(&$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));
 
                                $indent = (($toplevelpost) ? '' : ' comment');
 

diff --git a/object/Item.php b/object/Item.php
index aa9792b159875fbbb78691a979f29a78c7eb249e..3211048cef6745a124fb6987912fcfcfdb4ebb8a 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -155,7 +155,7 @@ class Item extends BaseObject {
 
                $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));
 
                $searchpath = $a->get_baseurl()."/search?tag=";
                $tags=array();