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

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

Browse source
This commit is contained in:
drigato 2013-12-12 11:48:11 -05:00
commit 974be86691
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -831,16 +831,18 @@ SQL;
{
$CC_CONFIG = Config::getConfig();
$scheduleTimeZone = new DateTimeZone('UTC');
/* if $p_fromDateTime and $p_toDateTime function parameters are null,
then set range * from "now" to "now + 24 hours". */
if (is_null($p_fromDateTime)) {
$t1 = new DateTime("@".time());
$t1 = new DateTime("@".time(), $scheduleTimeZone);
$range_start = $t1->format("Y-m-d H:i:s");
} else {
$range_start = Application_Model_Schedule::PypoTimeToAirtimeTime($p_fromDateTime);
}
if (is_null($p_fromDateTime)) {
$t2 = new DateTime("@".time());
$t2 = new DateTime("@".time(), $scheduleTimeZone);
$cache_ahead_hours = $CC_CONFIG["cache_ahead_hours"];