Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
This commit is contained in:
commit
da873b321b
2 changed files with 3 additions and 3 deletions
|
@ -1792,7 +1792,7 @@ SQL;
|
||||||
$show["instance_id"]);
|
$show["instance_id"]);
|
||||||
|
|
||||||
$options["show_empty"] = (array_key_exists($show['instance_id'],
|
$options["show_empty"] = (array_key_exists($show['instance_id'],
|
||||||
$content_count)) ? 1 : 0;
|
$content_count)) ? 0 : 1;
|
||||||
|
|
||||||
$events[] = &self::makeFullCalendarEvent($show, $options,
|
$events[] = &self::makeFullCalendarEvent($show, $options,
|
||||||
$startsDT, $endsDT, $startsEpochStr, $endsEpochStr);
|
$startsDT, $endsDT, $startsEpochStr, $endsEpochStr);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue