From 58dba3809f3a551ae8c966ccb841fa866b82927d Mon Sep 17 00:00:00 2001
From: Chirayu Chiripal <chirayu.chiripal@gmail.com>
Date: Wed, 21 May 2014 23:04:22 +0530
Subject: [PATCH] fixed browse foreign values copying description in input
 field

Signed-off-by: Chirayu Chiripal <chirayu.chiripal@gmail.com>
---
 js/sql.js                           | 2 +-
 libraries/browse_foreigners.lib.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index d10459a612dd..7acde7715e7a 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -496,7 +496,7 @@ function browseForeignDialog($this_a)
                 $input = $this_a.closest('.edit_area').prev('.edit_box');
             }
             // Set selected value as input value
-            $input.val($(this).text());
+            $input.val($(this).data('key'));
             $dialog.dialog('close');
         });
         $(formId).on('click', showAllId, function () {
diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php
index 7d093e94e207..aee6e6535711 100644
--- a/libraries/browse_foreigners.lib.php
+++ b/libraries/browse_foreigners.lib.php
@@ -154,7 +154,7 @@ function PMA_getHtmlForRelationalFieldSelection($db, $table, $field, $foreignDat
             . ' width="1" height="1" /></td>';
 
         $output .= PMA_getHtmlForColumnElement(
-            '', $rightKeynameIsSelected, $leftKeyname,
+            '', $rightKeynameIsSelected, $rightKeyname,
             $rightDescription, $rightDescriptionTitle, $field
         );
 
@@ -216,15 +216,17 @@ function PMA_getDescriptionAndTitle($description)
 function PMA_getHtmlForColumnElement($cssClass, $isSelected, $keyname,
     $description, $title, $field
 ) {
+    $keyname = htmlspecialchars($keyname);
     $output = '<td ' . $cssClass . '>'
         . ($isSelected ? '<strong>' : '')
-        . '<a class="foreign_value" href="#" title="' . __('Use this value')
+        . '<a class="foreign_value" data-key="' . $keyname . '" '
+        . 'href="#" title="' . __('Use this value')
         . ($title != ''
             ? ': ' . $title
             : '')
         . '">';
     if ($cssClass !== '') {
-        $output .= htmlspecialchars($keyname);
+        $output .= $keyname;
     } else {
         $output .= $description;
     }