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

Merge branch '2.5.x' into saas

This commit is contained in:
drigato 2015-05-11 12:18:09 -04:00
parent 3d99c423a9 56e5e959ec
commit 21886a509d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
airtime_mvc/application/services/ShowService.php
View File

@ -255,7 +255,22 @@ class Application_Service_ShowService
$showData["add_show_start_date"] = $this->origCcShowDay->getLocalStartDateAndTime()->format("Y-m-d");
}
$this->adjustSchedule($showData);
// 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);
}
}
$con->commit();