diff --git a/install/froxlor.sql b/install/froxlor.sql index 38d7c77d..e75c080d 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -465,7 +465,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.18-svn2'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.18'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('login', 'deactivatetime', '900'); diff --git a/install/updates/froxlor/0.9/update_0.9.inc.php b/install/updates/froxlor/0.9/update_0.9.inc.php index 6b2e646d..f1634e6d 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1466,3 +1466,11 @@ if(isFroxlorVersion('0.9.18-svn1')) updateToVersion('0.9.18-svn2'); } + +if(isFroxlorVersion('0.9.18-svn2')) +{ + showUpdateStep("Updating from 0.9.18-svn2 to 0.9.18 final"); + lastStepStatus(0); + + updateToVersion('0.9.18'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index f1bc3c8a..69d5b267 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.18-svn2'; +$version = '0.9.18'; $dbversion = '2'; $branding = '';