summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authorIgor Scheller <igor.scheller@igorshp.de>2018-10-14 18:24:42 +0200
committermsquare <msquare@notrademark.de>2018-10-31 13:43:23 +0100
commitd7aea575ff77cd37c326511e7ac5fe49067c63ad (patch)
tree7a9699346ac737e6791b81562f82eae205829e36 /includes/controller
parent57932be4287d0ea6235137f1a86f07cbb06dd35b (diff)
Replaced more sql queries and old data
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/users_controller.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php
index 61b19231..c8d8a4a9 100644
--- a/includes/controller/users_controller.php
+++ b/includes/controller/users_controller.php
@@ -215,9 +215,9 @@ function user_controller()
);
foreach ($shift['needed_angeltypes'] as &$needed_angeltype) {
$needed_angeltype['users'] = DB::select('
- SELECT `ShiftEntry`.`freeloaded`, `User`.*
+ SELECT `ShiftEntry`.`freeloaded`, `users`.*
FROM `ShiftEntry`
- JOIN `User` ON `ShiftEntry`.`UID`=`User`.`UID`
+ JOIN `users` ON `ShiftEntry`.`UID`=`users`.`id`
WHERE `ShiftEntry`.`SID` = ?
AND `ShiftEntry`.`TID` = ?
',