summaryrefslogtreecommitdiff
path: root/includes/model
diff options
context:
space:
mode:
authorBot <bot@myigel.name>2017-08-30 00:07:01 +0200
committerIgor Scheller <igor.scheller@igorshp.de>2017-08-30 00:22:02 +0200
commita473a56f1dbf568dc66cd6fcffe6b638308c542e (patch)
treec3f11e5fd08e0180d743a2ee0d2142f376662d8e /includes/model
parent341c076d98209b19f8360486ca41ac62e506db7b (diff)
Formatting
Diffstat (limited to 'includes/model')
-rw-r--r--includes/model/Shifts_model.php3
-rw-r--r--includes/model/User_model.php2
2 files changed, 3 insertions, 2 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index 88b28998..1589939d 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -45,7 +45,7 @@ function Shifts_by_ShiftsFilter(ShiftsFilter $shiftsFilter)
AND NOT `Shifts`.`PSID` IS NULL) AS tmp_shifts
ORDER BY `start`';
-
+
return DB::select(
$sql,
[
@@ -444,6 +444,7 @@ function Shift_update($shift)
*
* @param array $shift
* @return bool|null
+ * @throws Exception
*/
function Shift_update_by_psid($shift)
{
diff --git a/includes/model/User_model.php b/includes/model/User_model.php
index 4757ed3c..0ed602e0 100644
--- a/includes/model/User_model.php
+++ b/includes/model/User_model.php
@@ -241,7 +241,7 @@ function Users_by_angeltype($angeltype)
`UserAngelTypes`.`id` AS `user_angeltype_id`,
`UserAngelTypes`.`confirm_user_id`,
`UserAngelTypes`.`supporter`,
- (`UserDriverLicenses`.`user_id` IS NOT NULL) as `wants_to_drive`,
+ (`UserDriverLicenses`.`user_id` IS NOT NULL) AS `wants_to_drive`,
`UserDriverLicenses`.*
FROM `User`
JOIN `UserAngelTypes` ON `User`.`UID`=`UserAngelTypes`.`user_id`