Merge branch '2.5.x' into 2.5.x-saas

This commit is contained in:
drigato 2014-01-30 12:08:08 -05:00
commit aa9998d842

View file

@ -155,9 +155,9 @@ class Application_Service_ShowService
private function storeOrigLocalShowInfo() private function storeOrigLocalShowInfo()
{ {
if ($this->ccShow->isRepeating()) { if ($this->ccShow->isRepeating()) {
$this->origCcShowDay = $this->ccShow->getFirstRepeatingCcShowDay(); $this->origCcShowDay = clone $this->ccShow->getFirstRepeatingCcShowDay();
} else { } else {
$this->origCcShowDay = $this->ccShow->getFirstCcShowDay(); $this->origCcShowDay = clone $this->ccShow->getFirstCcShowDay();
} }
$this->oldShowTimezone = $this->origCcShowDay->getDbTimezone(); $this->oldShowTimezone = $this->origCcShowDay->getDbTimezone();