CC-1927: remove-pear-db
-fixed install/uninstall messages
This commit is contained in:
parent
2a9ea435f2
commit
1654de64b1
|
@ -60,6 +60,16 @@ class AirtimeInstall
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$version = $con->query($sql)->fetchColumn(0);
|
||||||
|
} catch (PDOException $e){
|
||||||
|
// no pref table therefore Airtime is not installed.
|
||||||
|
//We only get here if airtime database exists, but the table doesn't
|
||||||
|
//This state sometimes happens if a previous Airtime uninstall couldn't remove
|
||||||
|
//the database because it was busy, so it just removed the tables instead.
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
$sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version' LIMIT 1";
|
$sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version' LIMIT 1";
|
||||||
$version = $con->query($sql)->fetchColumn(0);
|
$version = $con->query($sql)->fetchColumn(0);
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,10 @@ if (!file_exists(AirtimeIni::CONF_FILE_AIRTIME)) {
|
||||||
require_once(__DIR__.'/airtime-constants.php');
|
require_once(__DIR__.'/airtime-constants.php');
|
||||||
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
|
require_once(AirtimeInstall::GetAirtimeSrcDir().'/application/configs/conf.php');
|
||||||
|
|
||||||
|
|
||||||
|
require_once 'propel/runtime/lib/Propel.php';
|
||||||
|
Propel::init(AirtimeInstall::GetAirtimeSrcDir()."/application/configs/airtime-conf-production.php");
|
||||||
|
|
||||||
echo PHP_EOL;
|
echo PHP_EOL;
|
||||||
echo "* Uninstalling Airtime ".AIRTIME_VERSION.PHP_EOL;
|
echo "* Uninstalling Airtime ".AIRTIME_VERSION.PHP_EOL;
|
||||||
//AirtimeInstall::UninstallPhpCode();
|
//AirtimeInstall::UninstallPhpCode();
|
||||||
|
|
Loading…
Reference in New Issue