Fix merge conflicts

Marc Delisle · Marc Delisle · commit 89698a9a93fc · 2013-04-02T10:38:13.000-04:00
diff --git a/ChangeLog b/ChangeLog
@@ -108,6 +108,7 @@ underscore
 - 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_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
@@ -447,7 +447,8 @@
     }
 
     $content_cells[$i][$ci] = '<select name="field_default_type[' . $i
-        . ']" class="default_type">';
+        . ']" 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
@@ -458,8 +459,8 @@
     }
     $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'])
             : '') . '"'
