Wiki allow [[~alias]] ==> Prenom NOM Xxxxx (aka Surnom)

[platal.git] / include / geoloc.inc.php

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index 915ce5d..133d6ea 100644 (file)
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -19,7 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-
 // {{{ liste les pays ou les régions d'un pays
 /** donne la liste déroulante des pays
  * @param $current pays actuellement selectionné
@@ -128,6 +127,7 @@ function get_new_maps($url)
     XDB::execute('INSERT INTO geoloc_maps VALUES '.substr($s, 1));
     return true;
 }
+// }}}
 
 // {{{ get_address_text($adr)
 /** make the text of an address that can be read by a mailman
@@ -349,7 +349,9 @@ function geoloc_getData_subcountries($mapid, $SFields, $minentities) {
         "SELECT  gm.map_id AS id, gm.name, gm.x, gm.y, gm.xclip, gm.yclip, 
                 gm.width, gm.height, gm.scale, 1 AS rat
         FROM    geoloc_maps AS gm
-        ".$wheremapid, Env::get('mapid',''));
+        ".$wheremapid, Env::v('mapid',''));
+
+    global $globals;
 
     while ($c = $submapres->next())
     {
@@ -362,7 +364,7 @@ function geoloc_getData_subcountries($mapid, $SFields, $minentities) {
     
     if ($mapid === false) return array($countries, $cities);
 
-       geoloc_getData_subcities(Env::getInt('mapid'), $SFields, $cities);
+       geoloc_getData_subcities(Env::i('mapid'), $SFields, $cities);
        $nbcities = count($cities);
        $nocity = $nbcities == 0;
 
@@ -419,5 +421,7 @@ function geoloc_getData_subcountries($mapid, $SFields, $minentities) {
        
     return array($countries, $cities);   
 } 
+// }}}
+
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>