diff options
author | msquare <msquare@notrademark.de> | 2019-12-27 19:47:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-27 19:47:52 +0100 |
commit | 0cab703c941e96d03072364c2082605f18245b5a (patch) | |
tree | 44ea0e2f23db7fa5a12bc5b971c56d773ed58c9f /includes/pages/admin_active.php | |
parent | 537179df66b1245f034e9bedeff7d74cbc6a7f5c (diff) | |
parent | e1471248fe8f8a4fc6edef28fe702245c2fde48d (diff) |
Merge pull request #705 from MyIgel/pronoun
User: Add pronoun statement
Diffstat (limited to 'includes/pages/admin_active.php')
-rw-r--r-- | includes/pages/admin_active.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 71d6914a..d82b8fa9 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -149,7 +149,7 @@ function admin_active() } } - $query = User::query() + $query = User::with('personalData') ->selectRaw( sprintf( ' @@ -211,9 +211,8 @@ function admin_active() } $shirtSize = $usr->personalData->shirt_size; - $userData = []; - $userData['nick'] = User_Nick_render($usr); + $userData['nick'] = User_Nick_render($usr) . User_Pronoun_render($usr); $userData['shirt_size'] = (isset($tshirt_sizes[$shirtSize]) ? $tshirt_sizes[$shirtSize] : ''); $userData['work_time'] = round($usr['shift_length'] / 60) . ' min (' . sprintf('%.2f', $usr['shift_length'] / 3600) . ' h)'; |