From: Vincent Zanotti <vincent.zanotti@polytechnique.org>
Date: Sat, 23 Aug 2008 14:22:49 +0000 (+0200)
Subject: Merge commit 'origin/master' into hruid
X-Git-Tag: xorg/0.10.0~86^2~40
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=dbbfabe9138005367547465c13e50b98f121bc36;p=platal.git

Merge commit 'origin/master' into hruid

Conflicts:
	classes/xnetsession.php
	classes/xorgsession.php
	core

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>
---

dbbfabe9138005367547465c13e50b98f121bc36
diff --cc modules/marketing.php
index 9cf8a9a,9507cf5..41219af
--- a/modules/marketing.php
+++ b/modules/marketing.php
@@@ -194,12 -194,12 +194,12 @@@ class MarketingModule extends PLModul
          if (!$res->numRows()) {
              return PL_NOT_FOUND;
          }
 -        $user = $res->fetchOneAssoc();
 -        $page->assign('user', $user);
 +        $user_data = $res->fetchOneAssoc();
 +        $page->assign('user', $user_data);
  
          $email = null;
+         require_once 'emails.inc.php';
          if (Post::has('mail')) {
-             require_once 'emails.inc.php';
              $email = valide_email(Post::v('mail'));
          }
          if (Post::has('valide') && isvalid_email_redirection($email)) {