Merge commit 'origin/master' into hruid

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

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

diff --cc classes/xnetsession.php
Simple merge

diff --cc classes/xorgsession.php
Simple merge

diff --cc include/banana/hooks.inc.php
Simple merge

diff --cc include/userset.inc.php
Simple merge

diff --cc modules/axletter.php
Simple merge

diff --cc modules/carnet.php
Simple merge

diff --cc modules/lists.php
Simple merge

diff --cc modules/marketing.php
index 9cf8a9a,9507cf5..41219af
--- 1/modules/marketing.php
--- 2/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)) {

diff --cc modules/platal.php
Simple merge

diff --cc modules/profile.php
Simple merge

diff --cc modules/register.php
Simple merge

diff --cc modules/search.php
Simple merge

diff --cc modules/xnetevents/xnetevents.inc.php
Simple merge

diff --cc modules/xnetgrp.php
Simple merge