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

CC-3047 : getting full calendar events setting editable flag incorrectly

This commit is contained in:
Naomi Aro 2011-11-15 16:32:07 +01:00
parent 6f91a9b107
commit 63d0163f15
2 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/models/DateHelper.php
View File

@ -224,8 +224,13 @@ class Application_Model_DateHelper
return $totalSeconds; return $totalSeconds;
} }
public static function ConvertToUtcDateTime($p_dateString, $timezone){ public static function ConvertToUtcDateTime($p_dateString, $timezone=null){
$dateTime = new DateTime($p_dateString, new DateTimeZone($timezone)); if (isset($timezone)) {
$dateTime = new DateTime($p_dateString, new DateTimeZone($timezone));
}
else {
$dateTime = new DateTime($p_dateString, new DateTimeZone(date_default_timezone_get()));
}
$dateTime->setTimezone(new DateTimeZone("UTC")); $dateTime->setTimezone(new DateTimeZone("UTC"));
return $dateTime; return $dateTime;

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

@ -1302,7 +1302,8 @@ class Application_Model_Show {
$shows = Application_Model_Show::getShows($start, $end); $shows = Application_Model_Show::getShows($start, $end);
$today_timestamp = date("Y-m-d H:i:s"); $today_timestamp = Application_Model_DateHelper::ConvertToUtcDateTime(date("Y-m-d H:i:s"))->format("Y-m-d H:i:s");
foreach ($shows as $show) { foreach ($shows as $show) {
if ($show["deleted_instance"] != "t"){ if ($show["deleted_instance"] != "t"){