Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-1927 Remove PEAR DB 

* Removed the DEB package "php-db" from the full install script as it is
  no longer needed.
* Missed one call to PEAR::isError()
This commit is contained in:
paul.baranowski 2012-04-05 02:41:51 -04:00 committed by Martin Konecny
parent 9ec584e90c
commit 235997c616
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/StoredFile.php
View File

@ -238,7 +238,7 @@ class Application_Model_StoredFile {
* 'empty'|'incomplete'|'ready'|'edited'
* @param int $p_editedby
* user id | 'NULL' for clear editedBy field
* @return TRUE|PEAR_Error
* @return TRUE
*/
public function setState($p_state, $p_editedby=NULL)
{

2
install_full/ubuntu/airtime-full-install
View File

@ -39,7 +39,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
libpulse0 vorbis-tools lsb-release php-db
libpulse0 vorbis-tools lsb-release
#install packages with --force-yes option (this is useful in the case
#of Debian, where these packages are unauthorized)

2
install_full/ubuntu/airtime-full-install-nginx
View File

@ -42,7 +42,7 @@ php-pear php5-gd postgresql odbc-postgresql python2.6 libsoundtouch-ocaml \
libtaglib-ocaml libao-ocaml libmad-ocaml ecasound \
libesd0 libportaudio2 libsamplerate0 rabbitmq-server patch \
php5-curl mpg123 monit python-virtualenv multitail libcamomile-ocaml-data \
libpulse0 vorbis-tools lsb-release php-db
libpulse0 vorbis-tools lsb-release
#install packages with --force-yes option (this is useful in the case
#of Debian, where these packages are unauthorized)

11
install_minimal/include/AirtimeInstall.php
View File

@ -69,13 +69,12 @@ class AirtimeInstall
}
if ($version == '') {
$sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
$result = $con->query($sql)->fetchColumn(0);
if (!PEAR::isError($result)) {
try {
// If this table exists, then it's 1.7.0
$sql = "SELECT * FROM cc_show_rebroadcast LIMIT 1";
$result = $con->query($sql)->fetchColumn(0);
$version = "1.7.0";
//echo "Airtime Version: ".$version." ".PHP_EOL;
}
else {
} catch (Exception $e) {
$version = null;
}
}