summaryrefslogtreecommitdiff
path: root/includes/controller
diff options
context:
space:
mode:
authormsquare <msquare@notrademark.de>2016-11-24 09:32:32 +0100
committermsquare <msquare@notrademark.de>2016-11-24 09:32:32 +0100
commitff31d0a1c59efc2c6dc3c66a803eac697041f572 (patch)
tree8813fb15cd3ed60cfa60c165116f7f9ea8e8c0aa /includes/controller
parent16e9a69c0dc66cc81e52e748c5a04301351cd204 (diff)
fix shift signup state being combined to null
Diffstat (limited to 'includes/controller')
-rw-r--r--includes/controller/shifts_controller.php2
1 files changed, 1 insertions, 1 deletions
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);
}
}