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

Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x

Browse source
This commit is contained in:
James 2012-10-22 15:35:20 -04:00
commit da873b321b
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/models/Show.php
View file

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

4
airtime_mvc/application/models/ShowInstance.php
View file

@ -674,14 +674,14 @@ WHERE ends > :p_start::TIMESTAMP
GROUP BY instance_id GROUP BY instance_id
SQL; SQL;
$counts = Application_Common_Database::prepareAndExecute( $sql, array( $counts = Application_Common_Database::prepareAndExecute($sql, array(
':p_start' => $p_start->format("Y-m-d G:i:s"), ':p_start' => $p_start->format("Y-m-d G:i:s"),
':p_end' => $p_end->format("Y-m-d G:i:s")) ':p_end' => $p_end->format("Y-m-d G:i:s"))
, 'all'); , 'all');
return $counts; return $counts;
} }
public function showEmpty() public function showEmpty()
{ {