Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

ChangeLog

@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4027 $cfg['MaxExactCount'] is ignored when BROWSING is back
 - bug #4482 Multi Column sorting (improved user experience)
 - bug #4478 Server validation does not work while in setup/mysqli
+- bug       Undefined variable when grid editing a foreign key column
 
 4.2.5.0 (2014-06-26)
 - bug #4467 shell_exec() has been disabled for security reasons

libraries/sql.lib.php

@@ -1087,16 +1087,13 @@ function PMA_findRealEndOfRows($db, $table)
  *
  * @param String $db            the current database
  * @param String $table         the current table
- * @param String $display_field display field
  *
  * @return void
  */
-function PMA_getRelationalValues($db, $table, $display_field)
+function PMA_getRelationalValues($db, $table)
 {
     $column = $_REQUEST['column'];
     if ($_SESSION['tmpval']['relational_display'] == 'D'
-        && isset($display_field)
-        && strlen($display_field)
         && isset($_REQUEST['relation_key_or_display_column'])
         && $_REQUEST['relation_key_or_display_column']
     ) {

sql.php

@@ -83,7 +83,7 @@ if (isset($_POST['bkm_fields']['bkm_database'])) {
 if (isset($_REQUEST['get_relational_values'])
     && $_REQUEST['get_relational_values'] == true
 ) {
-    PMA_getRelationalValues($db, $table, $display_field);
+    PMA_getRelationalValues($db, $table);
     // script has exited at this point
 }