Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -24,6 +24,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

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) {

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
             };