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

Merge branch 'master' of dev.sourcefabric.org:airtime

This commit is contained in:
Martin Konecny 2013-05-07 16:21:50 -04:00
parent 9f6a1033ea 80cdd3f2e2
commit 62d666ea4d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -976,7 +976,7 @@ SQL;
$this->createRebroadcastInstances($showDay, $date, $ccShowInstance->getDbId()); $this->createRebroadcastInstances($showDay, $date, $ccShowInstance->getDbId());
} }
} }
$start = $this->getNextMonthlyMonthlyRepeatDate($start, $timezone); $start = $this->getNextMonthlyMonthlyRepeatDate($start, $timezone, $showDay->getDbStartTime());
} }
$this->setNextRepeatingShowDate($start->format("Y-m-d"), $day, $show_id); $this->setNextRepeatingShowDate($start->format("Y-m-d"), $day, $show_id);
} }
@ -1034,7 +1034,7 @@ SQL;
* Enter description here ... * Enter description here ...
* @param $start * @param $start
*/ */
private function getNextMonthlyMonthlyRepeatDate($start, $timezone) private function getNextMonthlyMonthlyRepeatDate($start, $timezone, $startTime)
{ {
$dt = new DateTime($start->format("Y-m"), new DateTimeZone($timezone)); $dt = new DateTime($start->format("Y-m"), new DateTimeZone($timezone));
do { do {
@ -1042,6 +1042,12 @@ SQL;
} while (!checkdate($dt->format("m"), $start->format("d"), $dt->format("Y"))); } while (!checkdate($dt->format("m"), $start->format("d"), $dt->format("Y")));
$dt->setDate($dt->format("Y"), $dt->format("m"), $start->format("d")); $dt->setDate($dt->format("Y"), $dt->format("m"), $start->format("d"));
$startTime = explode(":", $startTime);
$hours = isset($startTime[0]) ? $startTime[0] : "00";
$minutes = isset($startTime[1]) ? $startTime[1] : "00";
$seconds = isset($startTime[2]) ? $startTime[2] : "00";
$dt->setTime($hours, $minutes, $seconds);
return $dt; return $dt;
} }