Fix GoogleMaps links

 ChangeLog                            |    1 +
 plugins/function.display_address.php |   10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1839 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/ChangeLog b/ChangeLog
index a1413c9..38fba1a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Bug/Wish:
 
     * Profile:
         - #663: Link to Xnet's map from the "My groups" page               -FRU
+        - Fix GoogleMaps links                                             -FRU
 
 From 0.9.14 branch:
 

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index 45cbb8e..fe5d355 100644 (file)
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -20,7 +20,8 @@
  ***************************************************************************/
 
 
-function smarty_function_display_address($param, &$smarty) {
+function smarty_function_display_address($param, &$smarty)
+{
     require_once('geoloc.inc.php');
     $txtad = get_address_text($param['adr']);
     if (!$txtad &&
@@ -30,8 +31,13 @@ function smarty_function_display_address($param, &$smarty) {
         !$param['adr']['mobile']) return "";
 
     $lines = explode("\n", $txtad);
+    $idt   = array_shift($lines); 
+
     $txthtml = "";
-    $map = "<a href=\"http://maps.google.fr/?q=".urlencode(str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines)))."\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
+    $map = "<a href=\"http://maps.google.fr/?q="
+         .   urlencode(str_replace('États-Unis d\'Amérique', 'USA', implode(", ", $lines) . " ($idt)"))
+         . "\"><img src=\"images/icons/map.gif\" alt=\"Google Maps\" title=\"Carte\"/></a>";
+    array_unshift($lines, $idt);
     if ($param['titre'])
     {
         if ($param['titre_div'])