Merge branch 'QA_4_3'

1 files changed, 4 insertions, 4 deletions

diff --git a/js/ajax.js b/js/ajax.js
index e4988b15d6..7ce41cbc48 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -359,7 +359,7 @@ var AJAX = {
                     $('#selflink > a').attr('href', data._selflink);
                 }
                 if (data._scripts) {
-                    AJAX.scriptHandler.load(data._scripts, data._params.token);
+                    AJAX.scriptHandler.load(data._scripts);
                 }
                 if (data._selflink && data._scripts && data._menuHash && data._params) {
                     AJAX.cache.add(
@@ -501,7 +501,7 @@ var AJAX = {
          *
          * @return void
          */
-        load: function (files, token) {
+        load: function (files) {
             var self = this;
             self._scriptsToBeLoaded = [];
             self._scriptsToBeFired = [];
@@ -523,7 +523,6 @@ var AJAX = {
                     request.push("scripts[]=" + script);
                 }
             }
-            request.push("token=" + token);
             request.push("call_done=1");
             // Download the composite js file, if necessary
             if (needRequest) {
@@ -556,6 +555,7 @@ var AJAX = {
             var script = document.createElement('script');
             script.type = 'text/javascript';
             script.src = url;
+            script.async = false;
             head.appendChild(script);
         },
         /**
@@ -733,7 +733,7 @@ AJAX.cache = {
                 $('#selflink').html(record.selflink);
                 AJAX.cache.menus.replace(AJAX.cache.menus.get(record.menu));
                 PMA_commonParams.setAll(record.params);
-                AJAX.scriptHandler.load(record.scripts, record.params ? record.params.token : PMA_commonParams.get('token'));
+                AJAX.scriptHandler.load(record.scripts);
                 AJAX.cache.current = ++index;
             });
         }