The branch, master has been updated via 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab (commit) via 9eba5726bd809ab874fc29360ac6ff351d86335b (commit) from 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a (commit)

- Log ----------------------------------------------------------------- commit 10cbf3bd6051838e4e10f0b80d6be6fb35e562ab Merge: 1a82ae1f11eb37012b041fcfe46fc06ecdbd779a 9eba5726bd809ab874fc29360ac6ff351d86335b Author: Rouslan Placella rouslan@placella.com Date: Fri Jul 15 19:31:43 2011 +0100

Merge branch 'QA_3_4'

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

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

diff --git a/ChangeLog b/ChangeLog index 55ab190..5c4a01f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,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 30f15d6..aa639e2 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1217,6 +1217,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(); @@ -1232,7 +1233,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