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

Merge branch '2.5.x' into saas

Browse source
This commit is contained in:
drigato 2015-05-11 14:57:58 -04:00
commit 77241bb6fc
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -255,21 +255,7 @@ class Application_Service_ShowService
$showData["add_show_start_date"] = $this->origCcShowDay->getLocalStartDateAndTime()->format("Y-m-d");
}
// We don't want to adjust the cc_schedule times if ONLY the timezone has changed
// adjust schedule if the show time changed AND the timezone did not change
if ($this->oldShowTimezone == $showData["add_show_timezone"] &&
(substr($this->origCcShowDay->getDbStartTime(), 0, 5) != $showData["add_show_start_time"])) {
$this->adjustSchedule($showData);
}
// adjust the schedule if both the timezone changed AND the show time changed
if ($this->oldShowTimezone != $showData["add_show_timezone"] &&
(substr($this->origCcShowDay->getDbStartTime(), 0, 5) != $showData["add_show_start_time"])) {
$this->adjustSchedule($showData);
}
$this->adjustSchedule($showData);
}