From bac38f3ef6ca06b24a650eb4361159e94157d99e Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 22 Dec 2014 14:58:58 +0530 Subject: [PATCH] bug #4653 Always connection error was shown, on /setup at tab "configuration storage" Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/config/Validator.class.php | 14 ++++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f777e1edfc..bd702bda3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.4.0 (not yet released) +- bug #4653 Always connection error was shown, on /setup at tab "configuration storage" 4.3.3.0 (2014-12-21) - bug The "Recently used tables" setting should be with Nav panel diff --git a/libraries/config/Validator.class.php b/libraries/config/Validator.class.php index a8cd231aac..5457e22695 100644 --- a/libraries/config/Validator.class.php +++ b/libraries/config/Validator.class.php @@ -296,11 +296,14 @@ class PMA_Validator /** * Validate server config * - * @param array $values config values + * @param string $path path to config, not used + * keep this parameter since the method is invoked using + * reflection along with other similar methods + * @param array $values config values * * @return array */ - public static function validateServer($values) + public static function validateServer($path, $values) { $result = array( 'Server' => '', @@ -355,11 +358,14 @@ class PMA_Validator /** * Validate pmadb config * - * @param array $values config values + * @param string $path path to config, not used + * keep this parameter since the method is invoked using + * reflection along with other similar methods + * @param array $values config values * * @return array */ - public static function validatePMAStorage($values) + public static function validatePMAStorage($path, $values) { $result = array( 'Server_pmadb' => '',