From b87a8227e5c80d6da1c5552fb0879607e1937ed9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 6 Jan 2014 19:49:47 -0500 Subject: [PATCH 1/3] bug #4220 Incorrect key values in foreign key browser 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 d67bb0df8a..ec8825dba4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,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 b52af538a0..e5515fc4bc 100644 --- a/libraries/browse_foreigners.lib.php +++ b/libraries/browse_foreigners.lib.php @@ -174,7 +174,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 .= ''; From ce30242e55d5af8b5eea5f3653a59b403e328e50 Mon Sep 17 00:00:00 2001 From: Douglas dreginatto Date: Mon, 6 Jan 2014 16:15:02 +0100 Subject: [PATCH 2/3] Translated using Weblate (Portuguese (Brazil)) Currently translated at 99.6% (2740 of 2749) --- po/pt_BR.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 2cc347d60d..bdb3f63f61 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-11-28 14:02+0200\n" -"Last-Translator: Helder Santana \n" -"Language-Team: Portuguese (Brazil) \n" +"PO-Revision-Date: 2014-01-06 16:14+0200\n" +"Last-Translator: Douglas dreginatto \n" +"Language-Team: Portuguese (Brazil) " +"\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2062,6 +2062,8 @@ msgstr "Exibir Detalhes de Relatório" msgid "" "Your export is incomplete, due to a low execution time limit at the PHP level" msgstr "" +"A exportação está incompleta devido ao baixo limite de tempo de execução no " +"PHP." #. l10n: Display text for calendar close link #: js/messages.php:438 From 0a65267a570e0567f7fd327da4ce6afd6a91c054 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 6 Jan 2014 20:04:22 -0500 Subject: [PATCH 3/3] 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 .= '';