diff options
author | Philip Häusler <msquare@notrademark.de> | 2015-08-13 22:38:32 +0200 |
---|---|---|
committer | Philip Häusler <msquare@notrademark.de> | 2015-08-13 22:38:32 +0200 |
commit | f9fb12c7f1d222334cadb2c6769528e66eb8962e (patch) | |
tree | 868b70456da16bd564da357812621b0d71caa31d /includes | |
parent | 34be996f229cacf6d6370526e5385f496b12ef99 (diff) |
show all forced active angels
Diffstat (limited to 'includes')
-rw-r--r-- | includes/pages/admin_active.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/pages/admin_active.php b/includes/pages/admin_active.php index 878c1df6..79bb5b35 100644 --- a/includes/pages/admin_active.php +++ b/includes/pages/admin_active.php @@ -103,7 +103,7 @@ function admin_active() { FROM `User` LEFT JOIN `ShiftEntry` ON `User`.`UID` = `ShiftEntry`.`UID` LEFT JOIN `Shifts` ON `ShiftEntry`.`SID` = `Shifts`.`SID` WHERE `User`.`Gekommen` = 1 - " . ($show_all_shifts ? "" : "AND `Shifts`.`end` < " . time()) . " + " . ($show_all_shifts ? "" : "AND (`Shifts`.`end` < " . time() . " OR `Shifts`.`end` IS NULL)") . " GROUP BY `User`.`UID` ORDER BY `force_active` DESC, `shift_length` DESC" . $limit); |