X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch.php;h=9845509fdc5482481de89ba51256b848adec5f2f;hb=6c49e229103128b29bcc10194f70e96e02cadb1a;hp=5a64865a7fd76760f95b389782130b141c59e371;hpb=86b5c8f0b6c9c79b9fb115efca8e6d21b13ec219;p=platal.git

diff --git a/modules/search.php b/modules/search.php
index 5a64865..9845509 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -183,6 +183,7 @@ class SearchModule extends PLModule
         }
         
         // default search
+        $q = preg_quote($q);
         $unique = '`user_id`';
         $db = '`auth_user_md5`';
         $realid = false;
@@ -363,7 +364,8 @@ class SearchModule extends PLModule
             $db = '`groupesx_def`';
             break;
           case 'nationalite':
-            $db = '`geoloc_pays`';
+            $db = '`geoloc_pays` INNER JOIN 
+                   `auth_user_md5` ON (`geoloc_pays`.`a2` = `auth_user_md5`.`nationalite`)';
             $field = 'IF(`nat`=\'\', `pays`, `nat`)';
             $id = '`a2`';
             break;
@@ -400,6 +402,7 @@ class SearchModule extends PLModule
         $page->assign('list', XDB::iterator('SELECT  '.$field.' AS field,
                                                      '.$id.' AS id
                                                FROM  '.$db.$where.'
+                                           GROUP BY  '.$field.'
                                            ORDER BY  '.$field));
     }
 }