From 79ca2f177203b9514c8f351eff4e24b6b4996af5 Mon Sep 17 00:00:00 2001
From: msquare <msquare@notrademark.de>
Date: Tue, 15 Nov 2016 21:33:54 +0100
Subject: add fixed shift calendar headers and timelane

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

(limited to 'includes/view/Shifts_view.php')

diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php
index 7ad580f4..629f6b2a 100644
--- a/includes/view/Shifts_view.php
+++ b/includes/view/Shifts_view.php
@@ -50,7 +50,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts,
   
   return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [
       msg(),
-      Shift_collides($shift, $user_shifts) ? info(_('This shift collides with one of your shifts.'), true) : '',
+      $shift_signup_state->getState() == ShiftSignupState::COLLIDES ? info(_('This shift collides with one of your shifts.'), true) : '',
       $shift_signup_state->getState() == ShiftSignupState::SIGNED_UP ? info(_('You are signed up for this shift.'), true) : '',
       ($shift_admin || $admin_shifttypes || $admin_rooms) ? buttons([
           $shift_admin ? button(shift_edit_link($shift), glyph('pencil') . _('edit')) : '',
-- 
cgit v1.2.3-54-g00ecf