do not check asso() in X.org

[platal.git] / modules / geoloc.php

diff --git a/modules/geoloc.php b/modules/geoloc.php
index 5c0be63..dd16609 100644 (file)
--- a/modules/geoloc.php
+++ b/modules/geoloc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2006 Polytechnique.org                              *
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -68,14 +68,14 @@ class GeolocModule extends PLModule
             $page->assign('request_geodesix', 1);
 
         if (!empty($GLOBALS['IS_XNET_SITE'])) {
-            $page->useMenu();
-            $page->setType($globals->asso('cat'));
             $page->assign('no_annu', 1);
+            new_annu_page('geoloc/index.tpl');
+        } else {
+            $page->changeTpl('geoloc/index.tpl');
         }
 
         require_once dirname(__FILE__).'/search/search.inc.php';
 
-        $page->changeTpl('geoloc/index.tpl');
         $fields = new SFieldGroup(true, advancedSearchFromInput());
         $search = str_replace('&amp;','&',$fields->get_url());
         if ((!Env::has('only_current') && !Env::has('rechercher')) || Env::v('only_current') == 'on')