From ae1397f28c028e408c50170893ff058e03fafc1e Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 8 Apr 2011 17:44:05 -0400 Subject: [PATCH] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/airtime-upgrade.php | 2 +- install/include/AirtimeInstall.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index a01f5bd9a..799cb4b76 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -12,7 +12,7 @@ AirtimeIni::ExitIfNotRoot(); echo "******************************** Update Begin *********************************".PHP_EOL; -system("php ".__DIR__."/upgrades/airtime-1.7/airtime-upgrade.php"); +//system("php ".__DIR__."/upgrades/airtime-1.7/airtime-upgrade.php"); system("php ".__DIR__."/upgrades/airtime-1.8/airtime-upgrade.php"); echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 49721cf74..ddac4bd06 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -152,7 +152,7 @@ class AirtimeInstall { $command = "php $dir/../../../library/doctrine/migrations/doctrine-migrations.phar ". "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". "--db-configuration=$dir/../../../library/doctrine/migrations/migrations-db.php ". - "--no-interaction migrations:version $version"; + "--no-interaction --add migrations:version $version"; system($command); }