Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
This commit is contained in:
commit
81912f2934
25
CREDITS
25
CREDITS
|
@ -2,11 +2,34 @@
|
|||
CREDITS
|
||||
=======
|
||||
|
||||
Version 2.5.1
|
||||
|
||||
Albert Santoni (albert.santoni@sourcefabric.org)
|
||||
Role: Developer Team Lead
|
||||
|
||||
Denise Rigato (denise.rigato@sourcefabric.org)
|
||||
Role: Software Developer
|
||||
|
||||
Naomi Aro (naomi.aro@sourcefabric.org)
|
||||
Role: Software Developer
|
||||
|
||||
Cliff Wang (cliff.wang@sourcefabric.org)
|
||||
Role: QA
|
||||
|
||||
Daniel James (daniel.james@sourcefabric.org)
|
||||
Role: Documentor & QA
|
||||
|
||||
|
||||
Community Contributors:
|
||||
|
||||
John Chewter
|
||||
|
||||
|
||||
Version 2.5.0
|
||||
-------------
|
||||
|
||||
Albert Santoni (albert.santoni@sourcefabric.org)
|
||||
Rold: Developer Team Lead
|
||||
Role: Developer Team Lead
|
||||
|
||||
Denise Rigato (denise.rigato@sourcefabric.org)
|
||||
Role: Software Developer
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -12,6 +12,12 @@ require_once(__DIR__.'/airtime-constants.php');
|
|||
// The only way we get here is if we are doing a new install or a reinstall.
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
$iniExists = file_exists("/etc/airtime/airtime.conf");
|
||||
if ($iniExists) {
|
||||
//reinstall, Will ask if we should rewrite config files.
|
||||
|
|
Loading…
Reference in New Issue