From 0a65267a570e0567f7fd327da4ce6afd6a91c054 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 6 Jan 2014 20:04:22 -0500 Subject: [PATCH] Fix merge conflict Signed-off-by: Marc Delisle --- ChangeLog | 1 + libraries/browse_foreigners.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 814033328b..b7817c1e5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -24,6 +24,7 @@ phpMyAdmin - ChangeLog - bug #4212 Table "disappears" if it has the same name as its tablegroup - bug #4213 Datetime Quick Edit decrements by one day - bug #4217 Current value not highlighted when browsing foreign values +- bug #4220 Incorrect key values in foreign key browser 4.1.3.0 (2013-12-31) - bug #3938 PDFDefaultPageSize doc and easy configurability diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php index e445f0d5a9..2929bff711 100644 --- a/libraries/browse_foreigners.lib.php +++ b/libraries/browse_foreigners.lib.php @@ -180,7 +180,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat $output .= PMA_getHtmlForColumnElement( 'class="nowrap"', $val_ordered_current_equals_data, - $key_ordered_current_key, $val_ordered_current_val, + $val_ordered_current_key, $val_ordered_current_val, $val_ordered_current_val_title, $field ); $output .= '';