CC-5595: Improper day of week comparison
Need to convert show instance start time to the show's local timezone before getting the repeat day of week
This commit is contained in:
parent
02453c52ee
commit
6c71b17024
|
@ -743,14 +743,23 @@ SQL;
|
||||||
*/
|
*/
|
||||||
else if (count($ccShowInstances) >= 1) {
|
else if (count($ccShowInstances) >= 1) {
|
||||||
$lastShowDays = array();
|
$lastShowDays = array();
|
||||||
|
|
||||||
|
//get the show's timezone
|
||||||
|
$ccShow = CcShowQuery::create()->findPk($showId);
|
||||||
|
if ($ccShow->isRepeating()) {
|
||||||
|
$showTimezone = $ccShow->getFirstRepeatingCcShowDay()->getDbTimezone();
|
||||||
|
} else {
|
||||||
|
$showTimezone = $ccShow->getFirstCcShowDay()->getDbTimezone();
|
||||||
|
}
|
||||||
|
|
||||||
/* Creates an array where the key is the day of the week (monday,
|
/* Creates an array where the key is the day of the week (monday,
|
||||||
* tuesday, etc.) and the value is the last show date for each
|
* tuesday, etc.) and the value is the last show date for each
|
||||||
* day of the week. We will use this array to update the last_show
|
* day of the week. We will use this array to update the last_show
|
||||||
* for each cc_show_days entry of a cc_show
|
* for each cc_show_days entry of a cc_show
|
||||||
*/
|
*/
|
||||||
foreach ($ccShowInstances as $instance) {
|
foreach ($ccShowInstances as $instance) {
|
||||||
$instanceStartDT = new DateTime($instance->getDbStarts(),
|
$instanceStartDT = $instance->getDbStarts(null);
|
||||||
new DateTimeZone("UTC"));
|
$instanceStartDT->setTimezone(new DateTimeZone($showTimezone));
|
||||||
$lastShowDays[$instanceStartDT->format("w")] = $instanceStartDT;
|
$lastShowDays[$instanceStartDT->format("w")] = $instanceStartDT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue