From f9fb12c7f1d222334cadb2c6769528e66eb8962e Mon Sep 17 00:00:00 2001 From: Philip Häusler Date: Thu, 13 Aug 2015 22:38:32 +0200 Subject: show all forced active angels --- includes/pages/admin_active.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'includes') 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); -- cgit v1.2.3-54-g00ecf