Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev

Browse source
This commit is contained in:
Duncan Sommerville 2015-09-29 12:00:07 -04:00
commit db1e69c00f
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
airtime_mvc/application/models/Schedule.php
View file

@ -1035,7 +1035,11 @@ SQL;
self::createStreamScheduleEvent($data, $item, $media_id, $uri);
}
else {
throw new Exception("Unknown schedule type: ".print_r($item, true));
//throw new Exception("Unknown schedule type: ".print_r($item, true));
//It's currently possible (and normal) to get cc_schedule rows without
//a file_id or stream_id. If you're using linked shows, placeholder rows can be put
//in the schedule when you cancel a track or delete stuff, so we should not throw an exception
//here and instead just ignore it.
}
}