From 2e9310daf19feca258bb14e9a2c4b635947d2d4e Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 8 Dec 2013 14:36:04 +0100 Subject: [PATCH] set master-branch version to next dev-version, so people don't break their database too early Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 6 +++--- lib/tables.inc.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 51b3792b..65019faa 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -521,7 +521,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'phpconfigs_hidestdsubdomain', '0'), ('panel', 'allow_theme_change_admin', '1'), ('panel', 'allow_theme_change_customer', '1'), - ('panel', 'version', '0.9.31-rc99'); + ('panel', 'version', '0.9.32-dev1'); DROP TABLE IF EXISTS `panel_tasks`; 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 39f24133..c1247649 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -2535,9 +2535,9 @@ if (isFroxlorVersion('0.9.31-rc1')) { updateToVersion('0.9.31-rc2'); } -if (isFroxlorVersion('0.9.31-rc2')) { +if (isFroxlorVersion('0.9.31')) { - showUpdateStep("Updating from 0.9.31-rc2 to 0.9.31-rc99"); + showUpdateStep("Updating from 0.9.31 to 0.9.32-dev1"); lastStepStatus(0); showUpdateStep("Removing APS-module (deprecated)"); @@ -2586,5 +2586,5 @@ if (isFroxlorVersion('0.9.31-rc2')) { Database::query("UPDATE `".TABLE_FTP_GROUPS."` SET `members` = CONCAT(`members`, ',".$settings['system']['httpuser']."');"); lastStepStatus(0); - updateToVersion('0.9.31-rc99'); + updateToVersion('0.9.32-dev1'); } diff --git a/lib/tables.inc.php b/lib/tables.inc.php index 8360ddce..c9565432 100644 --- a/lib/tables.inc.php +++ b/lib/tables.inc.php @@ -51,6 +51,6 @@ define('TABLE_PANEL_DOMAIN_SSL_SETTINGS', 'domain_ssl_settings'); define('TABLE_DOMAINTOIP', 'panel_domaintoip'); // VERSION INFO -$version = '0.9.31-rc99'; +$version = '0.9.32-dev1'; $dbversion = '2'; $branding = '';