From 9bbc3cf71378bce4d5fbc555cc5b9f6ea5b00e3f Mon Sep 17 00:00:00 2001 From: drigato Date: Thu, 12 Dec 2013 11:48:00 -0500 Subject: [PATCH] CC-5633: Can schedule overlapping shows The overlapping show check was returning false too early --- airtime_mvc/application/models/Schedule.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 39f45ea07..fca242f8f 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -1005,7 +1005,7 @@ SQL; ->filterByDbId($instanceId) ->findOne(); } - if ($update && (!$ccShowInstance || $ccShowInstance->getDbModifiedInstance() == true)) { + if ($update && ($ccShowInstance && $ccShowInstance->getDbModifiedInstance() == true)) { return false; }