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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
James 2012-09-06 16:46:35 -04:00
commit d9af434138
5 changed files with 63 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -51,7 +51,8 @@ class Application_Model_Schedule
"currentShow"=>$shows['currentShow'],
"nextShow"=>$shows['nextShow'],
"timezone"=> date("T"),
"timezoneOffset"=> date("Z"));
"timezoneOffset"=> date("Z")
);
return $range;
}
@ -70,7 +71,6 @@ class Application_Model_Schedule
return;
}
global $CC_CONFIG;
$con = Propel::getConnection();
$sql = "SELECT %%columns%% st.starts as starts, st.ends as ends,
st.media_item_played as media_item_played, si.ends as show_ends
@ -1076,7 +1076,6 @@ SQL;
and modified_instance = false and id != :instanceId order by ends");
$stmt->execute(array(
':showInstances' => $CC_CONFIG['showInstances'],
':show_end1' => $show_end->format('Y-m-d H:i:s'),
':show_end2' => $show_end->format('Y-m-d H:i:s'),
':show_end3' => $show_end->format('Y-m-d H:i:s'),