Merge commit 'origin/fusionax' into account

Conflicts:

	classes/user.php

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

diff --cc classes/user.php
index 7fb56c2,394cfd1..f97db1d
--- 1/classes/user.php
--- 2/classes/user.php
+++ b/classes/user.php
@@@ -138,20 -117,20 +138,20 @@@ class User extends PlUse
          }
  
          global $globals;
 -        $res = XDB::query("SELECT  u.hruid, d.promo,
 +        /** TODO: promo stuff again */
 +        /** TODO: fix perms field to fit new perms system */
-         $res = XDB::query("SELECT  a.hruid, d.promo_display AS promo,
++        $res = XDB::query("SELECT  a.hruid, d.promo,
                                     CONCAT(af.alias, '@{$globals->mail->domain}') AS forlife,
                                     CONCAT(ab.alias, '@{$globals->mail->domain}') AS bestalias,
 -                                   CONCAT(u.prenom, ' ', IF(u.nom_usage <> '', u.nom_usage, u.nom)) AS full_name,
 -                                   IF(u.prenom != '', u.prenom, u.nom) AS display_name,
 -                                   FIND_IN_SET('femme', u.flags) AS gender,
 -                                   q.core_mail_fmt AS email_format,
 -                                   u.perms
 -                             FROM  auth_user_md5 AS u
 -                       INNER JOIN  profile_display AS d ON (d.pid = u.user_id)
 -                        LEFT JOIN  auth_user_quick AS q ON (q.user_id = u.user_id)
 -                        LEFT JOIN  aliases AS af ON (af.id = u.user_id AND af.type = 'a_vie')
 -                        LEFT JOIN  aliases AS ab ON (ab.id = u.user_id AND FIND_IN_SET('bestalias', ab.flags))
 -                            WHERE  u.user_id = {?}", $this->user_id);
 +                                   a.full_name, a.display_name, a.sex = 'female' AS gender,
 +                                   IF(a.state = 'active', at.perms, '') AS perms,
 +                                   a.email_format, a.is_admin
 +                             FROM  accounts AS a
 +                       INNER JOIN  account_types AS at ON (at.type = a.type)
-                        INNER JOIN  profile_display AS d ON (d.uid = a.uid)
++                       INNER JOIN  profile_display AS d ON (d.pid = a.uid)
 +                        LEFT JOIN  aliases AS af ON (af.id = a.uid AND af.type = 'a_vie')
 +                        LEFT JOIN  aliases AS ab ON (ab.id = a.uid AND FIND_IN_SET('bestalias', ab.flags))
 +                            WHERE  a.uid = {?}", $this->user_id);
          $this->fillFromArray($res->fetchOneAssoc());
      }
  

diff --cc include/user.func.inc.php
Simple merge

diff --cc modules/events.php
Simple merge