From b6f02c7aed3af85a00fbf05c47a5ccade75fa076 Mon Sep 17 00:00:00 2001 From: coupling Date: Sun, 13 Nov 2011 10:02:57 -0500 Subject: [PATCH 1/2] patch #3428764 [edit] Inline edit on multi-server configuration --- ChangeLog | 1 + js/sql.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index b18adfd1fd..b0fd2ef7ce 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 ad91104ed3..3ad3d6eb45 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, From ac430ea21d6f49b781a9cda9940a5675d56f168e Mon Sep 17 00:00:00 2001 From: Remi COLLET Date: Tue, 15 Nov 2011 12:47:28 -0500 Subject: [PATCH 2/2] patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 --- ChangeLog | 1 + libraries/Error.class.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b0fd2ef7ce..2432fd3ff0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - 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 +- patch #3437354 [core] Notice: Array to string conversion in PHP 5.4 3.4.7.1 (2011-11-10) - [security] Fixed possible local file inclusion in XML import diff --git a/libraries/Error.class.php b/libraries/Error.class.php index 2cfd5fe751..595799be48 100644 --- a/libraries/Error.class.php +++ b/libraries/Error.class.php @@ -175,7 +175,7 @@ class PMA_Error extends PMA_Message $this->getMessage() . $this->getFile() . $this->getLine() . - $this->getBacktrace() + serialize($this->getBacktrace()) ); }