From 47709d414ef88a5ff63c0069c23e9d8b427bb68e Mon Sep 17 00:00:00 2001
From: Christian Simon <simon@swine.de>
Date: Fri, 13 Jun 2014 17:25:43 +0200
Subject: [PATCH] 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 <simon@swine.de>
Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 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
             };