Merge branch '1.9.1' into devel
Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/controllers/ScheduleController.php install_minimal/airtime-install install_minimal/include/AirtimeInstall.php install_minimal/include/airtime-upgrade.php python_apps/api_clients/api_client.py python_apps/pypo/pypofetch.py python_apps/pypo/pypopush.py
This commit is contained in:
commit
9c7bab616d
50 changed files with 205 additions and 125 deletions
|
@ -72,10 +72,14 @@ if (strcmp($version, "1.9.2") < 0){
|
|||
if (strcmp($version, "1.9.3") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.3/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "1.9.4") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-1.9.4/airtime-upgrade.php");
|
||||
}
|
||||
if (strcmp($version, "2.0.0") < 0){
|
||||
system("php ".__DIR__."/../upgrades/airtime-2.0.0/airtime-upgrade.php");
|
||||
}
|
||||
|
||||
|
||||
//set the new version in the database.
|
||||
$sql = "DELETE FROM cc_pref WHERE keystr = 'system_version'";
|
||||
$CC_DBC->query($sql);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue