X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fuserset.inc.php;h=bce96a45fbfea57ddb325bee56d04f67754980cd;hb=92630203925015ac6f70faaf4aacd05d26e5924b;hp=a76b7c134d2f4afc134dae3ee26a351b0b30947a;hpb=86b5c8f0b6c9c79b9fb115efca8e6d21b13ec219;p=platal.git

diff --git a/include/userset.inc.php b/include/userset.inc.php
index a76b7c1..bce96a4 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -153,11 +153,11 @@ class MinificheView extends MultipageView
         global $globals;
         $this->entriesPerPage = $globals->search->per_page;
         if (@$params['with_score']) {
-            $this->addSortKey('score', array('-score', '-watch_last', '-promo', 'nom', 'prenom'), 'pertinence');
+            $this->addSortKey('score', array('-score', '-date', '-promo', 'nom', 'prenom'), 'pertinence');
         }
         $this->addSortKey('name', array('nom', 'prenom'), 'nom');
         $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion');
-        $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification');
+        $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), 'dernière modification');
         parent::__construct($set, $data, $params);
     }
 
@@ -212,7 +212,7 @@ class MentorView extends MultipageView
         $this->addSortKey('rand', array('RAND(' . S::i('uid') . ')'), 'aléatoirement');
         $this->addSortKey('name', array('nom', 'prenom'), 'nom'); 
         $this->addSortKey('promo', array('-promo', 'nom', 'prenom'), 'promotion'); 
-        $this->addSortKey('date', array('-watch_last', '-promo', 'nom', 'prenom'), 'dernière modification'); 
+        $this->addSortKey('date_mod', array('-date', '-promo', 'nom', 'prenom'), 'dernière modification'); 
         parent::__construct($set, $data, $params); 
     }
 
@@ -329,8 +329,8 @@ class GeolocView implements PlView
             $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, u.promo, al.alias',
                                    "INNER JOIN  adresses AS adrf  ON (adrf.uid = u.user_id)
                                      LEFT JOIN  aliases  AS al   ON (u.user_id = al.id
-                                                                   AND FIND_IN_SET(al.flags, 'bestalias'))
-                                    INNER JOIN  adresses AS av ON (" . getadr_join('av') . ")",
+                                                                   AND FIND_IN_SET('bestalias', al.flags))
+                                    INNER JOIN  adresses AS avg ON (" . getadr_join('avg') . ")",
                                    'adrf.cityid = ' . Env::i('cityid'), null, null, 11);
             $page->assign('users', $it);
             break;