From c9549c6a1ddd15bbcf9a0f260328d17bda6b24a1 Mon Sep 17 00:00:00 2001 From: drigato Date: Mon, 28 Oct 2013 10:34:18 -0400 Subject: [PATCH 1/2] Delete unused code --- airtime_mvc/application/services/ShowService.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/airtime_mvc/application/services/ShowService.php b/airtime_mvc/application/services/ShowService.php index 72c76c02f..c347f6e68 100644 --- a/airtime_mvc/application/services/ShowService.php +++ b/airtime_mvc/application/services/ShowService.php @@ -163,11 +163,6 @@ class Application_Service_ShowService $this->storeOrigLocalShowInfo(); - // updates cc_show_instances start/end times, and updates - // schedule start/end times - // **Not sure why this function is here. It seems unnecesssary - //$this->applyShowStartEndDifference($showData); - $this->deleteRebroadcastInstances(); $this->deleteCcShowDays(); From 050d9848825cab52cddbe9e3925bf8ad6a8d21da Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Wed, 30 Oct 2013 18:09:57 -0400 Subject: [PATCH 2/2] CC-5487 : Calendar won't load under certain situation with linked shows --- airtime_mvc/application/services/SchedulerService.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/services/SchedulerService.php b/airtime_mvc/application/services/SchedulerService.php index 712ea6205..ee20ee360 100644 --- a/airtime_mvc/application/services/SchedulerService.php +++ b/airtime_mvc/application/services/SchedulerService.php @@ -173,6 +173,10 @@ class Application_Service_SchedulerService * any other instances with content */ $instanceIds = $ccShow->getInstanceIds(); + if (count($instanceIds) == 0) { + return; + } + $schedule_sql = "SELECT * FROM cc_schedule ". "WHERE instance_id IN (".implode($instanceIds, ",").")"; $ccSchedules = Application_Common_Database::prepareAndExecute( @@ -427,4 +431,4 @@ class Application_Service_SchedulerService return $redraw; } -} \ No newline at end of file +}