From c2639b895a5b5b48a8e57d58d24cac659162a700 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 15 Nov 2011 00:08:31 -0500 Subject: [PATCH] CC-2997: Daylight savings time affects repeating shows. -fix upgrade script --- .../DoctrineMigrations/Version20111103141311.php | 2 +- install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/install_minimal/DoctrineMigrations/Version20111103141311.php b/install_minimal/DoctrineMigrations/Version20111103141311.php index 970880e57..9be485e29 100644 --- a/install_minimal/DoctrineMigrations/Version20111103141311.php +++ b/install_minimal/DoctrineMigrations/Version20111103141311.php @@ -11,7 +11,7 @@ class Version20111103141311 extends AbstractMigration { // add timezone column to cc_show_days $cc_subjs = $schema->getTable('cc_show_days'); - $cc_subjs->addColumn('timezone', 'string', array('required' => true)); + $cc_subjs->addColumn('timezone', 'string', array('required' => true, 'default'=> '')); } public function down(Schema $schema) diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index bbec671ce..c685f763a 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -103,6 +103,7 @@ class AirtimeDatabaseUpgrade{ $showDays = CcShowDaysQuery::create()->find(); foreach ($showDays as $sd){ + /* $dt = new DateTime($sd->getDbFirstShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone("UTC")); $sd->setDbFirstShow($dt->format("Y-m-d")); @@ -113,6 +114,11 @@ class AirtimeDatabaseUpgrade{ $sd->setDbLastShow($dt->format("Y-m-d")); $sd->save(); + * */ + + $sd->setDbTimezone(date_default_timezone_get())->save(); + + } }