X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fcarnet.php;h=8db0fc2dbadbfb34ad1b45003e4f3cf961ceb410;hb=6cce7840e69bc0b6647e1bc5ea3437a925cd63a0;hp=b8132894c7accf2284944effffbc2c1307fc5377;hpb=ba4ddab60284c90647b546e5d1acd511288fa3dc;p=platal.git

diff --git a/modules/carnet.php b/modules/carnet.php
index b813289..8db0fc2 100644
--- a/modules/carnet.php
+++ b/modules/carnet.php
@@ -324,12 +324,9 @@ class CarnetModule extends PLModule
 
         $view->addMod('minifiche', 'Mini-fiches', true);
         $view->addMod('trombi', 'Trombinoscope', false, array('with_admin' => false, 'with_promo' => true));
-        // TODO: Reactivate when the new map is completed.
-        // $view->addMod('geoloc', 'Planisphère', false, array('with_annu' => 'carnet/contacts/search'));
+        $view->addMod('map', 'Planisphère');
         $view->apply('carnet/contacts', $page, $action, $subaction);
-        //if ($action != 'geoloc' || ($search && !$ssaction) || (!$search && !$subaction)) {
         $page->changeTpl('carnet/mescontacts.tpl');
-        //}
     }
 
     function handler_pdf($page, $arg0 = null, $arg1 = null)
@@ -339,7 +336,7 @@ class CarnetModule extends PLModule
 
         Platal::session()->close();
 
-        $order = array(new UFO_Name(Profile::LASTNAME), new UFO_Name(Profile::FIRSTNAME));
+        $order = array(new UFO_Name());
         if ($arg0 == 'promo') {
             $order = array_unshift($order, new UFO_Promo());
         } else {