bug #4653 Always connection error was shown, on /setup at tab "config…

…uration storage" Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
phpmyadmin · Dec 22, 2014 · bac38f3 · bac38f3
1 parent fb731ad
commit bac38f3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -296,11 +296,14 @@ public static function testDBConnection(
     /**
      * 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 @@ public static function validateServer($values)
     /**
      * 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' => '',