From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 19 Jul 2008 13:23:19 +0000 (+0200)
Subject: Should fix geoloc.
X-Git-Tag: xorg/0.9.17~25
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=06df222b7962dd5b71b34ec1dd078276d7327dbc;p=platal.git

Should fix geoloc.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index 51fc43c..8511a4e 100644
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -416,7 +416,7 @@ function geoloc_getData_subcities($mapid, $SFields, &$cities, $direct=true)
                           $where . ($direct ? "gcim.infos = 'smallest'" : '1'),
                           'gc.id, gc.alias',
                           'pop DESC');
-    while ($c = $cityres->next()) {
+    foreach($cityres as $c) {
         if ($c['pop'] > 0) {
             $city = $c;
             $city['x'] = geoloc_to_x($c['x'], $c['y']);
@@ -494,8 +494,8 @@ function geoloc_getData_subcountries($mapid, $sin, $minentities)
                             'NULL');
 
     $maxpop = 0;
-    $nbentities = $nbcities + $countryres->total();
-    while ($c = $countryres->next()) {
+    $nbentities = $nbcities + count($countryres);
+    foreach ($countryres as $c) {
         $c['latPop'] /= $c['nbPop'];
         $c['lonPop'] /= $c['nbPop'];
         $c['rad'] = size_of_territory($c['nbPop']);