gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_3'

Browse Source
This commit is contained in:
Madhura Jayaratne 2014-12-22 15:03:18 +05:30
commit 40dc352d3b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog
+ rfe #1579 Default to primary key when adding relation
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

14
libraries/config/Validator.class.php
View File

@ -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' => '',