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

Merge branch 'cc-2326-edit-show-end-date-problems' into 1.8.2

Browse source
This commit is contained in:
Naomi Aro 2011-06-06 20:06:24 +02:00
commit c8219e3b97
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Shows.php
View file

@ -1155,7 +1155,6 @@ class Show {
public static function getFullCalendarEvents($start, $end, $editable=false) public static function getFullCalendarEvents($start, $end, $editable=false)
{ {
$events = array(); $events = array();
$options = array();
$start_range = new DateTime($start); $start_range = new DateTime($start);
$end_range = new DateTime($end); $end_range = new DateTime($end);
@ -1166,6 +1165,8 @@ class Show {
$today_timestamp = date("Y-m-d H:i:s"); $today_timestamp = date("Y-m-d H:i:s");
foreach ($shows as $show) { foreach ($shows as $show) {
$options = array();
//only bother calculating percent for week or day view. //only bother calculating percent for week or day view.
if(intval($days) <= 7) { if(intval($days) <= 7) {
$show_instance = new ShowInstance($show["instance_id"]); $show_instance = new ShowInstance($show["instance_id"]);