Merge remote-tracking branch 'origin/master'

phpmyadmin · Feb 1, 2014 · eb16207 · eb16207
2 parents 08e3d58 + 2bb7740
commit eb16207
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -27,6 +27,7 @@ phpMyAdmin - ChangeLog
 - bug #4262 Cannot define a column with fractional seconds
 - bug #4265 Missing datepicker icon for DATETIME(length)
 - bug #4257 Hide fractional seconds when applicable
+- bug #4264 Uncheck "Ignore" while inserting, upon leaving a textarea
 
 4.1.6.0 (2014-01-26)
 - bug #4232 User not found after creating the user

diff --git a/js/tbl_change.js b/js/tbl_change.js
@@ -388,7 +388,8 @@ AJAX.registerOnload('tbl_change.js', function () {
                     var hashed_field = name_parts[1].match(/\[(.+)\]/)[1];
                     $this_element.attr('name', new_name);
 
-                    if ($this_element.is('.textfield')) {
+                    // handle input text fields and textareas
+                    if ($this_element.is('.textfield') || $this_element.is('.char')) {
                         // do not remove the 'value' attribute for ENUM columns
                         if ($this_element.closest('tr').find('span.column_type').html() != 'enum') {
                             $this_element.val($this_element.closest('tr').find('span.default_value').html());