From 47709d414ef88a5ff63c0069c23e9d8b427bb68e Mon Sep 17 00:00:00 2001 From: Christian Simon Date: Fri, 13 Jun 2014 17:25:43 +0200 Subject: [PATCH 1/2] Fix 'token mismatch' due to missing server parameter for some AJAX requests * server_privileges user duplicate request * js error_reporting * cf. https://sourceforge.net/p/phpmyadmin/bugs/3893 Signed-off-by: Christian Simon Signed-off-by: Marc Delisle --- js/error_report.js | 1 + js/server_privileges.js | 1 + 2 files changed, 2 insertions(+) diff --git a/js/error_report.js b/js/error_report.js index c52dc7bbda..8e80cccf19 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -21,6 +21,7 @@ var ErrorReport = { ErrorReport._last_exception = exception; $.get("error_report.php", { ajax_request: true, + server: PMA_commonParams.get('server'), token: PMA_commonParams.get('token'), get_settings: true }, function (data) { diff --git a/js/server_privileges.js b/js/server_privileges.js index 1016a803c9..c77cc521c7 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -193,6 +193,7 @@ AJAX.registerOnload('server_privileges.js', function () { var params = { 'ajax_request' : true, 'token' : PMA_commonParams.get('token'), + 'server' : PMA_commonParams.get('server'), 'validate_username' : true, 'username' : username }; From a33fcad037f58ddddb9714f186f12b49753062be Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 14 Jun 2014 09:19:56 -0400 Subject: [PATCH 2/2] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 01a6693fad..4bc3771e43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - Regenerate cookie encryption IV for every session - bug #4405 Cannot import (open_basedir): fix another case - bug #4457 SQL tab - Insert queries not showing affected row count +- bug Missing warning about existing account, on multi-server config 4.2.3.0 (2014-06-08) - bug #4423 Moving fields not working