From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Fri, 6 Oct 2006 07:31:17 +0000 (+0000)
Subject: Fix JMY's bug
X-Git-Tag: xorg/0.9.11~26
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4e35ce7c83db0dc437b6d52c13be70ee075ff260;p=platal.git

Fix JMY's bug
and
Enable access to $platal in templates even if the page has been killed


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

diff --git a/classes/Platal.php b/classes/Platal.php
index 27b75a5..a15f80f 100644
--- a/classes/Platal.php
+++ b/classes/Platal.php
@@ -131,6 +131,7 @@ class Platal
             $this->path = 'index';
         }
 
+        $page->assign_by_ref('platal', $this);
         switch ($this->call_hook($page)) {
           case PL_FORBIDDEN:
             $this->__mods['core']->handler_403($page);
@@ -140,7 +141,6 @@ class Platal
             $this->__mods['core']->handler_404($page);
             break;
         }
-        $page->assign_by_ref('platal', $this);
         $page->run();
     }
 
diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 85b4d07..c359913 100644
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -357,7 +357,7 @@ class XnetGrpModule extends PLModule
                                             $u, $globals->asso('id'));
                 $n   = $res->fetchOneCell();
                 if ($n) {
-                    $page->trig("$prenom $nom est déjà membre du groupe !");
+                    $page->kill("$prenom $nom est déjà membre du groupe !");
                     return;
                 }
                 elseif (Env::has('accept'))