Merge pull request #274 from engelsystem/task-164-shift-view

Task 164 shift view

1 files changed, 5 insertions, 1 deletions

diff --git a/includes/model/ShiftEntry_model.php b/includes/model/ShiftEntry_model.php
index 425b92e8..63127bc7 100644
--- a/includes/model/ShiftEntry_model.php
+++ b/includes/model/ShiftEntry_model.php
@@ -110,12 +110,16 @@ function ShiftEntries_finished_by_user($user) {
  * @param int $angeltype_id          
  */
 function ShiftEntries_by_shift_and_angeltype($shift_id, $angeltype_id) {
-  return sql_select("
+  $result = sql_select("
       SELECT *
       FROM `ShiftEntry`
       WHERE `SID`=" . sql_escape($shift_id) . "
       AND `TID`=" . sql_escape($angeltype_id) . "
       ");
+  if ($result === false) {
+    engelsystem_error("Unable to load shift entries.");
+  }
+  return $result;
 }
 
 /**