From 9fdcd090894095d48bdf445e68a8618140724d17 Mon Sep 17 00:00:00 2001 From: "Michael Kaufmann (d00p)" Date: Sun, 15 Jan 2017 07:44:58 +0100 Subject: [PATCH] fix install class, set version to 0.9.38.6 Signed-off-by: Michael Kaufmann (d00p) --- install/froxlor.sql | 2 +- install/lib/class.FroxlorInstall.php | 2 +- install/updates/froxlor/0.9/update_0.9.inc.php | 6 ++++++ lib/version.inc.php | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install/froxlor.sql b/install/froxlor.sql index 456a06fd45..e27409e431 100644 --- a/install/froxlor.sql +++ b/install/froxlor.sql @@ -581,7 +581,7 @@ INSERT INTO `panel_settings` (`settinggroup`, `varname`, `value`) VALUES ('panel', 'password_special_char_required', '0'), ('panel', 'password_special_char', '!?<>ยง$%+#=@'), ('panel', 'customer_hide_options', ''), - ('panel', 'version', '0.9.38.5'), + ('panel', 'version', '0.9.38.6'), ('panel', 'db_version', '201612110'); diff --git a/install/lib/class.FroxlorInstall.php b/install/lib/class.FroxlorInstall.php index 37acfc7c5d..ac9fb7f40b 100644 --- a/install/lib/class.FroxlorInstall.php +++ b/install/lib/class.FroxlorInstall.php @@ -181,7 +181,7 @@ private function _checkPostData() $this->_data['servername'] = ''; } - if (empty($this->_data['serverip'] || $this->_validate_ip($this->_data['serverip']) == false)) { + if (empty($this->_data['serverip']) || $this->_validate_ip($this->_data['serverip']) == false) { return false; } 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 c75af54fd4..a759879f8f 100644 --- a/install/updates/froxlor/0.9/update_0.9.inc.php +++ b/install/updates/froxlor/0.9/update_0.9.inc.php @@ -3579,3 +3579,9 @@ showUpdateStep("Updating from 0.9.38.4 to 0.9.38.5", false); updateToVersion('0.9.38.5'); } + +if (isFroxlorVersion('0.9.38.5')) { + + showUpdateStep("Updating from 0.9.38.5 to 0.9.38.6", false); + updateToVersion('0.9.38.6'); +} diff --git a/lib/version.inc.php b/lib/version.inc.php index 113b065dcc..cf3170c3de 100644 --- a/lib/version.inc.php +++ b/lib/version.inc.php @@ -16,7 +16,7 @@ */ // Main version variable -$version = '0.9.38.5'; +$version = '0.9.38.6'; // Database version (YYYYMMDDC where C is a daily counter) $dbversion = '201612110';