diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2018-10-14 18:24:42 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2018-10-31 13:43:23 +0100 |
| commit | d7aea575ff77cd37c326511e7ac5fe49067c63ad (patch) | |
| tree | 7a9699346ac737e6791b81562f82eae205829e36 /includes/model/ShiftEntry_model.php | |
| parent | 57932be4287d0ea6235137f1a86f07cbb06dd35b (diff) | |
Replaced more sql queries and old data
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] |