From 3fd30add3c7f66cef8e40d80183591b6d2126db7 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Wed, 23 Nov 2016 22:31:11 +0100
Subject: fix NPE

---
 includes/controller/shifts_controller.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index f273c097..3086b948 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -1,5 +1,6 @@
 <?php
 
+use Engelsystem\ShiftSignupState;
 function shift_link($shift) {
   return page_link_to('shifts') . '&action=view&shift_id=' . $shift['SID'];
 }
@@ -200,7 +201,7 @@ function shift_controller() {
   $angeltypes = AngelTypes();
   $user_shifts = Shifts_by_user($user);
   
-  $shift_signup_state = null;
+  $shift_signup_state = new ShiftSignupState(ShiftSignupState::OCCUPIED, 0);
   foreach ($angeltypes as $angeltype) {
     $angeltype_signup_state = Shift_signup_allowed($user, $shift, $angeltype, null, $user_shifts);
     if ($shift_signup_state == null) {
-- 
cgit v1.2.3-54-g00ecf


From ff31d0a1c59efc2c6dc3c66a803eac697041f572 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Thu, 24 Nov 2016 09:32:32 +0100
Subject: fix shift signup state being combined to null

---
 includes/controller/shifts_controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/controller')

diff --git a/includes/controller/shifts_controller.php b/includes/controller/shifts_controller.php
index 3086b948..1500b449 100644
--- a/includes/controller/shifts_controller.php
+++ b/includes/controller/shifts_controller.php
@@ -207,7 +207,7 @@ function shift_controller() {
     if ($shift_signup_state == null) {
       $shift_signup_state = $angeltype_signup_state;
     } else {
-      $shift_signup_state = $shift_signup_state->combineWith($angeltype_signup_state);
+      $shift_signup_state->combineWith($angeltype_signup_state);
     }
   }
   
-- 
cgit v1.2.3-54-g00ecf