Merge commit 'origin/master' into fusionax

[platal.git] / classes / user.php

diff --git a/classes/user.php b/classes/user.php
index 96c1bcc..e7c7472 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -117,15 +117,16 @@ class User extends PlUser
         }
 
         global $globals;
-        $res = XDB::query("SELECT  u.hruid, u.promo,
+        $res = XDB::query("SELECT  u.hruid, d.promo_display AS promo,
                                    CONCAT(af.alias, '@{$globals->mail->domain}') AS forlife,
                                    CONCAT(ab.alias, '@{$globals->mail->domain}') AS bestalias,
-                                   CONCAT(u.prenom, ' ', u.nom) AS full_name,
+                                   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.uid = 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))