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

CC-5594 : Remove all date_default_timezone_get()

This commit is contained in:
Naomi 2013-12-04 14:13:19 -05:00
parent 22595c1098
commit c9773d2a0e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/Bootstrap.php
View File

@ -17,10 +17,8 @@ require_once "Timezone.php";
require_once __DIR__.'/forms/helpers/ValidationTypes.php';
require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
date_default_timezone_set('UTC');
require_once (APPLICATION_PATH."/logging/Logging.php");
Logging::setLogPath('/var/log/airtime/zendphp.log');
date_default_timezone_set(Application_Model_Preference::GetTimezone());
Config::setAirtimeVersion();
require_once __DIR__."/configs/navigation.php";

8
airtime_mvc/application/models/Show.php
View File

@ -1091,8 +1091,8 @@ SQL;
$content_count = Application_Model_ShowInstance::getContentCount(
$p_start, $p_end);
$isFull = Application_Model_ShowInstance::getIsFull($p_start, $p_end);
$timezone = date_default_timezone_get();
$current_timezone = new DateTimeZone($timezone);
$userTimezone = Application_Model_Preference::GetUserTimezone();
$displayTimezone = new DateTimeZone($userTimezone);
$utc = new DateTimeZone("UTC");
$now = new DateTime("now", $utc);
@ -1124,8 +1124,8 @@ SQL;
}
}
$startsDT->setTimezone($current_timezone);
$endsDT->setTimezone($current_timezone);
$startsDT->setTimezone($displayTimezone);
$endsDT->setTimezone($displayTimezone);
$options["show_empty"] = (array_key_exists($show['instance_id'],
$content_count)) ? 0 : 1;