The branch, master has been updated via 08861788590164bab28c8dbaa4f58eebd772a7bc (commit) via 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 (commit) from f05a988b86049fae9eadfa0c1f29cb020d332930 (commit)

- Log ----------------------------------------------------------------- commit 08861788590164bab28c8dbaa4f58eebd772a7bc Merge: f05a988b86049fae9eadfa0c1f29cb020d332930 396e4e99799c91a8c39f2bbe156e6795cdef6ee5 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Wed Jun 15 20:10:54 2011 +0530

Merge branch 'QA_3_4'

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

Summary of changes: ChangeLog | 3 ++- js/functions.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog index e648e2f..f30beea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -phpMyAdmin - ChangeLog +phpMyAdmin - ChangeLog ======================

3.5.0.0 (not yet released) @@ -29,6 +29,7 @@ - bug #3313210 [interface] Columns class sometimes changed for nothing - patch #3313326 [interface] Some tooltips do not disappear - bug #3315720 [search] Fix search in non unicode tables +- bug #3315741 [display] Inline query edit broken

3.4.2.0 (2011-06-07) - bug #3301249 [interface] Iconic table operations does not remove inline edit label diff --git a/js/functions.js b/js/functions.js index 4ad7c77..1b09f63 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1151,7 +1151,7 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - $(".inline_edit_sql").click( function(){ + $(".inline_edit_sql").live('click', function(){ var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val();

hooks/post-receive