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

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Browse source
This commit is contained in:
Martin Konecny 2012-08-20 16:54:10 -04:00
commit 4f7c8bf0db
11 changed files with 377 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install_minimal/include/AirtimeIni.php
View file

@ -237,7 +237,7 @@ class AirtimeIni
$n=count($lines);
for ($i=0; $i<$n; $i++) {
if (strlen($lines[$i]) && !in_array(substr($lines[$i], 0, 1), array('#', PHP_EOL))){
$info = explode("=", $lines[$i]);
$info = explode("=", $lines[$i], 2);
$values[trim($info[0])] = trim($info[1]);
}
}

5
install_minimal/include/airtime-upgrade.php
View file

@ -116,5 +116,8 @@ if (strcmp($version, "2.1.3") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.1.3/airtime-upgrade.php");
pause();
}
if (strcmp($version, "2.2.0") < 0){
passthru("php --php-ini $SCRIPTPATH/../airtime-php.ini $SCRIPTPATH/../upgrades/airtime-2.2.0/airtime-upgrade.php");
pause();
}
echo "******************************* Upgrade Complete *******************************".PHP_EOL;