diff options
| author | Philip Häusler <msquare@notrademark.de> | 2014-12-25 22:32:18 +0100 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2014-12-25 22:32:18 +0100 |
| commit | e89acc0c1d1188662da7490e3a75a4a5c3950a75 (patch) | |
| tree | f646260cc23195008f6ca5152426b17641fc4f69 /includes/model/ShiftEntry_model.php | |
| parent | bcd33c02c814a8d82c08c078c8fae287d1cd95a5 (diff) | |
| parent | 544a51612f14c4f3cf7d1c4a6de26a99ea94b788 (diff) | |
merge feature-shift-types
Diffstat (limited to 'includes/model/ShiftEntry_model.php')
| -rw-r--r-- | includes/model/ShiftEntry_model.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index e1f0cd2e..5129f15a 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -76,7 +76,8 @@ function ShiftEntries_upcoming_for_user($user) { return sql_select(" SELECT * FROM `ShiftEntry` - JOIN `Shifts` ON `Shifts`.`SID`=`ShiftEntry`.`SID` + JOIN `Shifts` ON (`Shifts`.`SID` = `ShiftEntry`.`SID`) + JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . " AND `Shifts`.`end` > " . sql_escape(time()) . " ORDER BY `Shifts`.`end` |