Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.5.x'

This commit is contained in:
Albert Santoni 2013-10-30 18:12:31 -04:00
parent d4dae440f0 050d984882
commit 70c2d396bc
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
airtime_mvc/application/services/SchedulerService.php
View File

@ -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;
}
}
}

5
airtime_mvc/application/services/ShowService.php
View File

@ -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();