The branch, QA_3_4 has been updated via 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) from 3ec3c7ee1766331a25899483ff78ff468516fc2e (commit)

- Log ----------------------------------------------------------------- -----------------------------------------------------------------------

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

diff --git a/ChangeLog b/ChangeLog index eecc5b9..d3e081a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog - bug #3357837 [interface] TABbing through a NULL field in the inline mode resets NULL - remove version number in /setup - bug #3367993 [usability] Missing "Generate Password" button +- bug #3363221 [display] Missing Server Parameter on inline sql query

3.4.3.1 (2011-07-02) - [security] Fixed possible session manipulation in swekey authentication, see PMASA-2011-5 diff --git a/js/functions.js b/js/functions.js index eea8573..75fd677 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1117,6 +1117,7 @@ function changeMIMEType(db, table, reference, mime_type) */ $(document).ready(function(){ $(".inline_edit_sql").live('click', function(){ + var server = $(this).prev().find("input[name='server']").val(); 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(); @@ -1132,7 +1133,8 @@ $(document).ready(function(){ $(this).click(function(){ sql_query = $(this).prev().val(); window.location.replace("import.php" - + "?db=" + encodeURIComponent(db) + + "?server=" + encodeURIComponent(server) + + "&db=" + encodeURIComponent(db) + "&table=" + encodeURIComponent(table) + "&sql_query=" + encodeURIComponent(sql_query) + "&show_query=1"

hooks/post-receive