Merge remote-tracking branch 'origin/QA_4_0' into QA_4_0

phpmyadmin · Oct 2, 2013 · 63c87b8 · 63c87b8
2 parents 35ad381 + 58e1960
commit 63c87b8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -17,6 +17,7 @@ phpMyAdmin - ChangeLog
 - bug #4109 Drizzle tables in navigation are shown as views
 - bug #4095 NUL symbols added to the end of database dump file
 - bug #4105 More disappears in table Structure
+- bug #3992 Multi-row edit doesn't clear values when checking NULL
 
 4.0.7.0 (2013-09-23)
 - bug #3993 Sorting in database overview with statistics doesn't work

diff --git a/js/tbl_change.js b/js/tbl_change.js
@@ -223,7 +223,7 @@ function verificationsAfterFieldChange(urlField, multi_edit, theType)
 AJAX.registerTeardown('tbl_change.js', function() {
     $('span.open_gis_editor').die('click');
     $("input[name='gis_data[save]']").die('click');
-    $('input.checkbox_null').unbind('click');
+    $('input.checkbox_null').die('click');
     $('select[name="submit_type"]').unbind('change');
     $("#insert_rows").die('change');
 });
@@ -276,7 +276,7 @@ AJAX.registerOnload('tbl_change.js', function() {
      * "Continue insertion" are handled in the "Continue insertion" code
      *
      */
-    $('input.checkbox_null').bind('click', function(e) {
+    $('input.checkbox_null').live('click', function(e) {
             nullify(
                 // use hidden fields populated by tbl_change.php
                 $(this).siblings('.nullify_code').val(),