CC-1927: remove-pear-db

-fixed install/uninstall messages
This commit is contained in:
Martin Konecny 2012-04-20 16:16:27 -04:00
parent 1654de64b1
commit 79d8eda53a
1 changed files with 4 additions and 9 deletions

View File

@ -60,6 +60,8 @@ class AirtimeInstall
return null; return null;
} }
$sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version' LIMIT 1";
try { try {
$version = $con->query($sql)->fetchColumn(0); $version = $con->query($sql)->fetchColumn(0);
} catch (PDOException $e){ } catch (PDOException $e){
@ -70,17 +72,10 @@ class AirtimeInstall
return null; return null;
} }
$sql = "SELECT valstr FROM cc_pref WHERE keystr = 'system_version' LIMIT 1"; //if version is empty string, then version is older than version 1.8.0
$version = $con->query($sql)->fetchColumn(0);
if (!$version) {
// no pref table something is wrong.
return null;
}
if ($version == '') { if ($version == '') {
try { try {
// If this table exists, then it's 1.7.0 // If this table exists, then it's version 1.7.0
$sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1"; $sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
$result = $con->query($sql)->fetchColumn(0); $result = $con->query($sql)->fetchColumn(0);
$version = "1.7.0"; $version = "1.7.0";