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

Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x

Browse source 
Conflicts:
	install_minimal/include/airtime-install.php
This commit is contained in:
drigato 2013-12-03 11:25:09 -05:00
commit 3b539b7c04
6 changed files with 89 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
install_minimal/include/AirtimeInstall.php
View file

@ -224,7 +224,7 @@ class AirtimeInstall
return true;
}
$command = "su postgres -c \"createdb $database --encoding UTF8 --owner $username\"";
$command = "sudo -i -u postgres psql postgres -c \"CREATE DATABASE ".$database." WITH ENCODING 'UTF8' TEMPLATE template0 OWNER ".$username."\"";
@exec($command, $output, $results);
if ($results == 0) {

4
install_minimal/include/airtime-install.php
View file

@ -12,9 +12,9 @@ require_once(__DIR__.'/airtime-constants.php');
// The only way we get here is if we are doing a new install or a reinstall.
// -------------------------------------------------------------------------
//Enforce a minimum PHP version
if (!AirtimeInstall::checkPHPVersion())
if (PHP_VERSION_ID < 50400) //PHP 5.4
{
echo("ERROR: Your PHP version is too old!\nAirtime requires PHP 5.4 or greater.\n");
exit(1);
}