From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sun, 27 Jul 2008 20:01:53 +0000 (+0200)
Subject: Merge commit 'origin/platal-0.9.17'
X-Git-Tag: xorg/0.10.0~151
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=d4775fe2dea4db5e6ca3db4a6034bb03a8b711cc;p=platal.git

Merge commit 'origin/platal-0.9.17'

Conflicts:

	modules/marketing.php

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

d4775fe2dea4db5e6ca3db4a6034bb03a8b711cc
diff --cc modules/marketing.php
index 77ee08d,b40c90a..11a34f9
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@@ -267,7 -267,9 +267,7 @@@ class MarketingModule extends PLModul
              $page->assign('promo', $promo);
  
              if (Post::has('valide')) {
-                 S::assert_xstf_token();
+                 S::assert_xsrf_token();
 -
 -                require_once('xorg.misc.inc.php');
                  $email = trim(Post::v('mail'));
  
                  if (!isvalid_email_redirection($email)) {