diff options
| author | jwacalex <aboehm@dompfaffenweg.de> | 2016-11-30 23:23:49 +0100 |
|---|---|---|
| committer | jwacalex <aboehm@dompfaffenweg.de> | 2016-11-30 23:23:49 +0100 |
| commit | 45cda10479a16c237f917b69dc24ab3f31bffa89 (patch) | |
| tree | 5aa98a6504d7558b56b7777f04b87a3b976bbedf /includes/model/ShiftEntry_model.php | |
| parent | 79b9f9448e4f3ad7abb8d795c1404b3221c95bf9 (diff) | |
| parent | 53e12065c76af4e5a0a2690e92e6724eed9f2895 (diff) | |
merged master and issue
Diffstat (limited to 'includes/model/ShiftEntry_model.php')
| -rw-r--r-- | includes/model/ShiftEntry_model.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php index 99f67028..dca7e1c1 100644 --- a/includes/model/ShiftEntry_model.php +++ b/includes/model/ShiftEntry_model.php @@ -115,6 +115,7 @@ function ShiftEntries_finished_by_user($user) { JOIN `ShiftTypes` ON `ShiftTypes`.`id` = `Shifts`.`shifttype_id` WHERE `ShiftEntry`.`UID`=" . sql_escape($user['UID']) . " AND `Shifts`.`end` < " . sql_escape(time()) . " + AND `ShiftEntry`.`freeloaded` = 0 ORDER BY `Shifts`.`end` "); } |