[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_4, updated. RELEASE_3_4_7_1-26-gb6f02c7

[Marc Delisle]

The branch, QA_3_4 has been updated
       via  b6f02c7aed3af85a00fbf05c47a5ccade75fa076 (commit)
      from  0212c7c01562418410c559ca081ef6239e6b13cb (commit)


- Log -----------------------------------------------------------------
commit b6f02c7aed3af85a00fbf05c47a5ccade75fa076
Author: coupling <coupling at users.sourceforge.net>
Date:   Sun Nov 13 10:02:57 2011 -0500

    patch #3428764 [edit] Inline edit on multi-server configuration

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

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

diff --git a/ChangeLog b/ChangeLog
index b18adfd..b0fd2ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 + patch #3433770 [config] Make location of php-gettext configurable
 - patch #3430291 [import] Handle conflicts in some open_basedir situations
 - bug #3431427 [display] Dropdown results - setting NULL does not work
+- patch #3428764 [edit] Inline edit on multi-server configuration
 
 3.4.7.1 (2011-11-10)
 - [security] Fixed possible local file inclusion in XML import
diff --git a/js/sql.js b/js/sql.js
index ad91104..3ad3d6e 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -705,6 +705,7 @@ $(document).ready(function() {
                 // Make the Ajax call and get the data, wrap it and insert it
                 $.post('sql.php', {
                     'token' : window.parent.token,
+                    'server' : window.parent.server,
                     'db' : window.parent.db,
                     'ajax_request' : true,
                     'sql_query' : sql_query,
@@ -728,6 +729,7 @@ $(document).ready(function() {
                 var post_params = {
                         'ajax_request' : true,
                         'get_relational_values' : true,
+                        'server' : window.parent.server,
                         'db' : window.parent.db,
                         'table' : window.parent.table,
                         'column' : field_name,
@@ -753,6 +755,7 @@ $(document).ready(function() {
                 var post_params = {
                         'ajax_request' : true,
                         'get_enum_values' : true,
+                        'server' : window.parent.server,
                         'db' : window.parent.db,
                         'table' : window.parent.table,
                         'column' : field_name,
@@ -776,6 +779,7 @@ $(document).ready(function() {
                 var post_params = {
                         'ajax_request' : true,
                         'get_set_values' : true,
+                        'server' : window.parent.server,
                         'db' : window.parent.db,
                         'table' : window.parent.table,
                         'column' : field_name,
@@ -991,6 +995,7 @@ $(document).ready(function() {
                             'sql_query' : sql_query,
                             'disp_direction' : disp_mode,
                             'token' : window.parent.token,
+                            'server' : window.parent.server,
                             'db' : window.parent.db,
                             'table' : window.parent.table,
                             'clause_is_unique' : nonunique,


hooks/post-receive
-- 
phpMyAdmin