X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=eb91985b5586ca9428ed83d1514f670695c8a454;hb=27492fde1b530ce8631dea8b408e7e09231d966a;hp=e380dacde2037f0f7168675f85a0308b645a0228;hpb=e72022bc6771235ffe21ea9b437a45aa1cdbaa96;p=platal.git diff --git a/classes/user.php b/classes/user.php index e380dac..eb91985 100644 --- a/classes/user.php +++ b/classes/user.php @@ -165,7 +165,7 @@ class User extends PlUser IF(ef.email IS NULL, NULL, CONCAT(ef.email, \'@\', df.name)) AS forlife_alternate, IF(eb.email IS NULL, NULL, CONCAT(eb.email, \'@\', mb.name)) AS bestalias, (er.redirect IS NULL AND a.state = \'active\' AND FIND_IN_SET(\'mail\', at.perms)) AS lost, - a.email, a.full_name, a.directory_name, a.display_name, a.sex = \'female\' AS gender, + a.email, a.full_name, a.directory_name, a.display_name, a.sort_name, a.sex = \'female\' AS gender, IF(a.state = \'active\', CONCAT(at.perms, \',\', IF(a.user_perms IS NULL, \'\', a.user_perms)), \'\') AS perms, a.user_perms, a.email_format, a.is_admin, a.state, a.type, at.description AS type_description, a.skin, FIND_IN_SET(\'watch\', a.flags) AS watch, a.comment, @@ -352,6 +352,14 @@ class User extends PlUser return $this->profile()->directory_name; } + public function sortName() + { + if (!$this->hasProfile()) { + return $this->sort_name; + } + return $this->profile()->sort_name; + } + static public function compareDirectoryName($a, $b) { return strcasecmp(replace_accent($a->directoryName()), replace_accent($b->directoryName()));