- set version to 0.9.15 for upcoming release
This commit is contained in:
@@ -27,7 +27,7 @@ return array(
|
||||
'settinggroup' => 'system',
|
||||
'varname' => 'webserver',
|
||||
'type' => 'option',
|
||||
'default' => 'Apache2',
|
||||
'default' => 'apache2',
|
||||
'option_mode' => 'one',
|
||||
'option_options' => array('apache2' => 'Apache 2', 'lighttpd' => 'ligHTTPd', 'nginx' => 'Nginx'),
|
||||
'save_method' => 'storeSettingField',
|
||||
|
||||
2178
install/froxlor.sql
2178
install/froxlor.sql
File diff suppressed because it is too large
Load Diff
@@ -1261,3 +1261,11 @@ if(isFroxlorVersion('0.9.14'))
|
||||
|
||||
updateToVersion('0.9.15-svn1');
|
||||
}
|
||||
|
||||
if(isFroxlorVersion('0.9.15-svn1'))
|
||||
{
|
||||
showUpdateStep("Updating from 0.9.15-svn1 to 0.9.15 final");
|
||||
lastStepStatus(0);
|
||||
|
||||
updateToVersion('0.9.15');
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ define('PACKAGE_ENABLED', 2);
|
||||
|
||||
// VERSION INFO
|
||||
|
||||
$version = '0.9.15-svn1';
|
||||
$version = '0.9.15';
|
||||
$dbversion = '2';
|
||||
$branding = '';
|
||||
|
||||
|
||||
@@ -118,17 +118,6 @@ while($row = $db->fetch_array($result_tasks))
|
||||
$configdir.='/*';
|
||||
safe_exec('rm -rf '. makeCorrectFile($configdir));
|
||||
}
|
||||
elseif($settings['system']['webserver'] == "nginx")
|
||||
{
|
||||
if($settings['system']['mod_fcgid'] == 1)
|
||||
{
|
||||
$webserver = new nginx_fcgid($db, $cronlog, $debugHandler, $idna_convert, $settings);
|
||||
}
|
||||
else
|
||||
{
|
||||
$webserver = new nginx($db, $cronlog, $debugHandler, $idna_convert, $settings);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if(!isset($webserver))
|
||||
|
||||
Reference in New Issue
Block a user