From eaa503cd5d8c4243b1d803eb466366bb67a2ce32 Mon Sep 17 00:00:00 2001
From: Kasun Chathuranga <chathuranga.jayaneththi@gmail.com>
Date: Tue, 2 Apr 2013 06:32:55 +0530
Subject: [PATCH] Fix bug #3800 Incorrect keyhandler behaviour #2

---
 ChangeLog                        | 1 +
 libraries/tbl_properties.inc.php | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 43abe9e53e..8646cf8535 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug #3705 Attempt to open trigger for edit gives NULL
 - Use HTML5 DOCTYPE 
 - [security] Self-XSS on GIS visualisation page, reported by Janek Vind
+- bug #3800 Incorrect keyhandler behaviour #2
 
 3.5.7.0 (2013-02-15)
 - bug #3779 [core] Problem with backslash in enum fields
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 3fc404240d..ab4a95e3b9 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -365,7 +365,8 @@ for ($i = 0; $i < $num_fields; $i++) {
         $row['DefaultValue'] = PMA_convert_bit_default_value($row['DefaultValue']);
     }
 
-    $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']" class="default_type">';
+    $content_cells[$i][$ci] = '<select name="field_default_type[' . $i . ']"'
+        . ' id="field_' . $i . '_' . ($ci - $ci_offset) . '" class="default_type">';
     foreach ($default_options as $key => $value) {
         $content_cells[$i][$ci] .= '<option value="' . $key . '"';
         // is only set when we go back to edit a field's structure
@@ -376,8 +377,8 @@ for ($i = 0; $i < $num_fields; $i++) {
     }
     $content_cells[$i][$ci] .= '</select>';
     $content_cells[$i][$ci] .= '<br />';
-    $content_cells[$i][$ci] .= '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"'
-        . ' type="text" name="field_default_value[' . $i . ']" size="12"'
+    $content_cells[$i][$ci] .= '<input type="text"'
+        . ' name="field_default_value[' . $i . ']" size="12"'
         . ' value="' . (isset($row['DefaultValue']) ? htmlspecialchars($row['DefaultValue']) : '') . '"'
         . ' class="textfield default_value" />';
     $ci++;