From 62dcf6e1a5bd151042b222d58181709d8f8f36cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20F=C3=B6rster=20=28Dessa=29?= Date: Wed, 18 Jan 2012 12:41:44 +0100 Subject: [PATCH] Tagging 0.9.26 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Robert Förster (Dessa) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 7 +++++++ lib/tables.inc.php | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 66390d34..39f37c8f 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -469,7 +469,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('syste INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('system', 'bind_enable', '1'); 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.26-rc1'); +INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'version', '0.9.26'); 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 f02292e8..efaeb076 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -1765,3 +1765,10 @@ if(isFroxlorVersion('0.9.26-svn1')) updateToVersion('0.9.26-rc1'); } +if(isFroxlorVersion('0.9.26-rc1')) +{ + showUpdateStep("Updating from 0.9.26-rc1 to 0.9.26"); + lastStepStatus(0); + + updateToVersion('0.9.26'); +} diff --git a/lib/tables.inc.php b/lib/tables.inc.php index f3e873e1..b6468d26 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -73,6 +73,6 @@ define('PACKAGE_ENABLED', 2); // VERSION INFO -$version = '0.9.26-rc1'; +$version = '0.9.26'; $dbversion = '2'; $branding = '';