diff options
Diffstat (limited to 'includes/model/ShiftEntry_model.php')
| -rw-r--r-- | includes/model/ShiftEntry_model.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index 593e40b2..248e7d1e 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -48,11 +48,7 @@ function ShiftEntries_by_shift($shift_id) { return DB::select(' SELECT - `User`.`Nick`, - `User`.`email`, - `User`.`email_shiftinfo`, - `User`.`Sprache`, - `User`.`Gekommen`, + `users`.*, `ShiftEntry`.`UID`, `ShiftEntry`.`TID`, `ShiftEntry`.`SID`, @@ -60,7 +56,7 @@ function ShiftEntries_by_shift($shift_id) `ShiftEntry`.`Comment`, `ShiftEntry`.`freeloaded` FROM `ShiftEntry` - JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID` + JOIN `users` ON `ShiftEntry`.`UID`=`users`.`id` JOIN `AngelTypes` ON `ShiftEntry`.`TID`=`AngelTypes`.`id` WHERE `ShiftEntry`.`SID` = ?', [$shift_id] |