X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=55d8d1ab9b518af168c65a836743cda539cc1bea;hb=bf52ec4e8de2e1c22020f7fffbf543ab4ee7f41a;hp=2a399adae2aeb1087c90d479a3794dce6b4c4c0c;hpb=1285cf5413df654ccac839b9d9a32c4df2cee95a;p=platal.git

diff --git a/classes/user.php b/classes/user.php
index 2a399ad..55d8d1a 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -179,7 +179,7 @@ class User extends PlUser
                                       CONCAT(af.alias, \'@' . $globals->mail->domain2 . '\') AS forlife_alternate,
                                       IF (ab.alias IS NULL, a.email, CONCAT(ab.alias, \'@' . $globals->mail->domain . '\')) AS bestalias,
                                       CONCAT(ab.alias, \'@' . $globals->mail->domain2 . '\') AS bestalias_alternate,
-                                      a.full_name, a.display_name, a.sex = \'female\' AS gender,
+                                      a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender,
                                       IF(a.state = \'active\', at.perms, \'\') AS perms,
                                       a.email_format, a.is_admin, a.state, a.type, a.skin,
                                       FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment,
@@ -307,7 +307,7 @@ class User extends PlUser
     public function directoryName()
     {
         if (!$this->hasProfile()) {
-            return $this->full_name;
+            return $this->directory_name;
         }
         return $this->profile()->directory_name;
     }