Backport [1775]

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

diff --git a/include/userset.inc.php b/include/userset.inc.php
index aba0254..263bbb6 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -330,7 +330,7 @@ class GeolocView implements PlView
                                    "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('bestalias', al.flags))
-                                    INNER JOIN  adresses AS av ON (" . getadr_join('av') . ")",
+                                    INNER JOIN  adresses AS avg ON (" . getadr_join('avg') . ")",
                                    'adrf.cityid = ' . Env::i('cityid'), null, null, 11);
             $page->assign('users', $it);
             break;

diff --git a/modules/search.php b/modules/search.php
index 09f2e63..5b1c5a8 100644 (file)
--- a/modules/search.php
+++ b/modules/search.php
@@ -80,6 +80,13 @@ class SearchModule extends PLModule
     {
         global $globals;
 
+        $res = XDB::query("SELECT  MIN(`diminutif`), MAX(`diminutif`)
+                             FROM  `groupex`.`asso`
+                            WHERE  `cat` = 'Promotions'");
+        list($min, $max) = $res->fetchOneRow();
+        $page->assign('promo_min', $min);
+        $page->assign('promo_max', $max);
+
         if (Env::has('quick') || $action == 'geoloc') {
             $page->assign('formulaire', 0);
 
@@ -104,12 +111,6 @@ class SearchModule extends PLModule
                 new ThrowError('il n\'existe personne correspondant à ces critères dans la base !');
             }
         } else {
-            $res = XDB::query("SELECT  MIN(`diminutif`), MAX(`diminutif`)
-                                 FROM  `groupex`.`asso`
-                                WHERE  `cat` = 'Promotions'");
-            list($min, $max) = $res->fetchOneRow();
-            $page->assign('promo_min', $min);
-            $page->assign('promo_max', $max); 
             $page->assign('formulaire',1);
             $page->addJsLink('ajax.js');
         }
@@ -117,7 +118,6 @@ class SearchModule extends PLModule
         require_once dirname(__FILE__) . '/search/search.inc.php';
         $page->changeTpl('search/index.tpl');            
         $page->assign('xorg_title','Polytechnique.org - Annuaire');
-        $page->assign('baseurl', $globals->baseurl);
     }
 
     function handler_advanced(&$page, $action = null, $subaction = null)

diff --git a/templates/search/quick.tpl b/templates/search/quick.tpl
index 78fc793..019dbd4 100644 (file)
--- a/templates/search/quick.tpl
+++ b/templates/search/quick.tpl
@@ -37,7 +37,7 @@
         showTempMessage('message', "La promotion doit être entre {/literal}{$promo_min} et {$promo_max}{literal}.", false);
         return false;
       }
-      window.open("http://www.polytechnique.net/login/" + value + "/trombi");
+      window.open("http://www.polytechnique.net/login/" + value + "/annuaire/trombi");
       return false;
   }
   {/literal}