From 5d36c7228d86fddf64db48a6e534baf2215816ff Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Mon, 23 Aug 2010 06:43:22 +0000 Subject: [PATCH] - set version to 0.9.12, preparing for tag --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 8 ++++++++ lib/tables.inc.php | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 6f3ad834..dffb09c1 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -456,7 +456,7 @@ INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) V INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (18, 'system', 'vmail_homedir', '/var/customers/mail/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (19, 'system', 'bindconf_directory', '/etc/bind/'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (20, 'system', 'bindreload_command', '/etc/init.d/bind9 reload'); -INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.12-svn6'); +INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (22, 'panel', 'version', '0.9.12'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (23, 'system', 'hostname', 'SERVERNAME'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (24, 'login', 'maxloginattempts', '3'); INSERT INTO `panel_settings` (`settingid`, `settinggroup`, `varname`, `value`) VALUES (25, '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 0e8c0d6d..57b297aa 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1019,3 +1019,11 @@ if(isFroxlorVersion('0.9.12-svn5')) updateToVersion('0.9.12-svn6'); } + +if(isFroxlorVersion('0.9.12-svn6')) +{ + showUpdateStep("Updating from 0.9.12-svn6 to 0.9.12 final"); + lastStepStatus(0); + + updateToVersion('0.9.12'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 5f19662d..4eaef147 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -72,7 +72,7 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.12-svn6'; +$version = '0.9.12'; $dbversion = '2'; $branding = '';