The branch, master has been updated via 4ae5cb079944786b0d57fccda045e9ac72dc9fab (commit) via 58d25ddcb8a036743e32879c9320dcd802626082 (commit) via a546479680cd1da8af6812ed0eef83b390bab07f (commit) from 99c1692b077403fceba39831ce2b559248d1a2ba (commit)

- Log ----------------------------------------------------------------- commit 4ae5cb079944786b0d57fccda045e9ac72dc9fab Merge: 99c1692b077403fceba39831ce2b559248d1a2ba 58d25ddcb8a036743e32879c9320dcd802626082 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sun Jul 10 18:00:46 2011 +0530

Merge branch 'QA_3_4'

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 1 + js/sql.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog index b03cafb..af1f275 100644 --- a/ChangeLog +++ b/ChangeLog @@ -44,6 +44,7 @@ phpMyAdmin - ChangeLog - bug #3353649 [interface] "Create an index on X columns" form not validated - bug #3350790 [interface] JS error in Table->Structure->Index->Edit - bug #3353811 [interface] Info message has "error" class +- bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL

3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/sql.js b/js/sql.js index 48fb65f..9b54bb9 100644 --- a/js/sql.js +++ b/js/sql.js @@ -685,7 +685,10 @@ $(document).ready(function() { }) } else { $this_field.find('textarea').live('keypress', function(e) { - $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + // FF errorneously triggers for modifier keys such as tab (bug #3357837) + if (e.which != 0) { + $('.checkbox_null_' + field_name + '_' + this_row_index).attr('checked', false); + } }) }

hooks/post-receive