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

Merge branch '2.4.x' into ryerson-history

Browse source
This commit is contained in:
Naomi Aro 2013-09-07 16:41:57 +02:00
commit 0d089b787d
2 changed files with 43 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/common/Timezone.php
View file

@ -14,7 +14,8 @@ class Application_Common_Timezone
'Australia' => DateTimeZone::AUSTRALIA, 'Australia' => DateTimeZone::AUSTRALIA,
'Europe' => DateTimeZone::EUROPE, 'Europe' => DateTimeZone::EUROPE,
'Indian' => DateTimeZone::INDIAN, 'Indian' => DateTimeZone::INDIAN,
'Pacific' => DateTimeZone::PACIFIC 'Pacific' => DateTimeZone::PACIFIC,
'UTC' => DateTimeZone::UTC
); );
$tzlist = array(); $tzlist = array();

5
airtime_mvc/application/services/ShowService.php
View file

@ -964,8 +964,9 @@ SQL;
*/ */
if (isset($lastCreatedShow)) { if (isset($lastCreatedShow)) {
/* Set UTC to local time before setting the next repeat date. If we don't /* Set UTC to local time before setting the next repeat date. If we don't
* the next repeat date might be scheduled for the following day */ * the next repeat date might be scheduled for the following day
$lastCreatedShow->setTimezone(new DateTimeZone(Application_Model_Preference::GetTimezone())); * THIS MUST BE IN THE TIMEZONE THE SHOW WAS CREATED IN */
$lastCreatedShow->setTimezone(new DateTimeZone($timezone));
$nextDate = $lastCreatedShow->add($repeatInterval); $nextDate = $lastCreatedShow->add($repeatInterval);
$this->setNextRepeatingShowDate($nextDate->format("Y-m-d"), $day, $show_id); $this->setNextRepeatingShowDate($nextDate->format("Y-m-d"), $day, $show_id);
} }