closes #493 fixe le bouton 'Lister les camarades de la carte'

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

diff --git a/ChangeLog b/ChangeLog
index 6716bca..1cb2635 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,6 +56,9 @@ Bug/Wish:
     * Emails:
         - #512: Can attach a file                                          -FRU
 
+    * Geoloc:
+        - #493: Fix "List map search" button                               -Car
+
     * Lists:
         - #588: Auto-select mail to moderate                               -FRU
         - #598: Ask for confirmation                                       -FRU

diff --git a/modules/geoloc.php b/modules/geoloc.php
index dd16609..6ec7551 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -86,6 +86,7 @@ class GeolocModule extends PLModule
         $search = preg_replace('/(^|&)mapid=([0-9]+)(&)/','\1\3', $search);
         if ($search)
             $search = '?'.$search;
+        $page->assign('search_nourlencode',$search);
         $page->assign('search',urlencode($search));
 
         $page->assign('protocole', substr($globals->baseurl,0,strpos($globals->baseurl,':')));

diff --git a/templates/geoloc/index.tpl b/templates/geoloc/index.tpl
index 0a38c26..a76c8d0 100644 (file)
--- a/templates/geoloc/index.tpl
+++ b/templates/geoloc/index.tpl
@@ -94,7 +94,7 @@ function searchMapId(f)
   </p>
   <p class="smaller">Carte fournie gracieusement par <a href="http://www.geodesix.com/">Geodesix</a>.</p>
   {if !$no_annu}
-    <form id="search_form" action="search/adv/?{$dynamap_vars|default:"only_current=on"}&amp;rechercher=1" method="post">
+    <form id="search_form" action="search/adv/{$search_nourlencode}&amp;rechercher=1" method="post">
     <p>
        <input type="button" value="Lister les camarades de la carte ci-dessus" onclick="searchMapId(this.form)"/>
     </p>