From 57ae88a96768013bbffd059cc2f45b0d73e1be52 Mon Sep 17 00:00:00 2001 From: "alejandro.campos@artica.es" Date: Tue, 19 Mar 2024 17:22:39 +0100 Subject: [PATCH] check history db mysql version in update --- pandora_console/required_um_versions.php | 1 - .../update_manager_client/lib/UpdateManager/Client.php | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pandora_console/required_um_versions.php b/pandora_console/required_um_versions.php index f6f7ae5afa..0543377f87 100644 --- a/pandora_console/required_um_versions.php +++ b/pandora_console/required_um_versions.php @@ -3,4 +3,3 @@ // Versions must be specified as a string in the following formats: '8', '8.0.30', ... $php_version = '8.2'; $mysql_version = '8'; -$mysql_version_history = '8'; diff --git a/pandora_console/update_manager_client/lib/UpdateManager/Client.php b/pandora_console/update_manager_client/lib/UpdateManager/Client.php index 57208baf19..4dd1b81d0e 100644 --- a/pandora_console/update_manager_client/lib/UpdateManager/Client.php +++ b/pandora_console/update_manager_client/lib/UpdateManager/Client.php @@ -1527,11 +1527,11 @@ class Client if (is_string($curr_mysql_version_hist) === true && empty($curr_mysql_version_hist) === false ) { - if (isset($mysql_version_history) === true - && is_string($mysql_version_history) === true - && $this->compareVersions($curr_mysql_version_hist, $mysql_version_history) < 0 + if (isset($mysql_version) === true + && is_string($mysql_version) === true + && $this->compareVersions($curr_mysql_version_hist, $mysql_version) < 0 ) { - throw new \Exception('MySQL version (history database) >= '.$mysql_version_history.' is required'); + throw new \Exception('MySQL version (history database) >= '.$mysql_version.' is required'); } } }