From f5dc8aa1c9fdfbcffb0d1eab20f93907f1fbd0b8 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Tue, 2 Aug 2016 08:51:34 +0200 Subject: [PATCH] set version to 0.9.37 for upcoming release Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 12 ++++++++---- lib/version.inc.php | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 77005af0..82141521 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -560,7 +560,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_numeric', '0'), ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), - ('panel', 'version', '0.9.37-rc1'), + ('panel', 'version', '0.9.37'), ('panel', 'db_version', '201607210'); 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 6bacb52b..c71cd9fe 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3397,9 +3397,7 @@ if (isDatabaseVersion('201606190')) { if (isFroxlorVersion('0.9.36')) { - showUpdateStep("Updating from 0.9.36 to 0.9.37-rc1"); - lastStepStatus(0); - + showUpdateStep("Updating from 0.9.36 to 0.9.37-rc1", false); updateToVersion('0.9.37-rc1'); } @@ -3408,6 +3406,12 @@ if (isDatabaseVersion('201607140')) { showUpdateStep("Adding new setting to hide certain options in customer panel"); Settings::AddNew("panel.customer_hide_options", ""); lastStepStatus(0); - + updateToDbVersion('201607210'); } + +if (isFroxlorVersion('0.9.37-rc1')) { + + showUpdateStep("Updating from 0.9.37-rc1 to 0.9.37 final", false); + updateToVersion('0.9.37'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index ab7a59d4..2265248e 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -16,7 +16,7 @@ */ // Main version variable -$version = '0.9.37-rc1'; +$version = '0.9.37'; // Database version (YYYYMMDDC where C is a daily counter) $dbversion = '201607210';