Merge pull request #18214 from liviuconcioiu/18211

Fix #18211 - Add server id parameter
phpmyadmin · Mar 4, 2023 · ec8a6a4 · ec8a6a4
2 parents 12b924d + cde3650
commit ec8a6a4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 12 deletions.
diff --git a/js/src/export.js b/js/src/export.js
@@ -727,16 +727,22 @@ Export.checkTimeOut = function (timeLimit) {
     limit = limit + 1;
     clearTimeout(timeOut);
     timeOut = setTimeout(function () {
-        $.get('index.php?route=/export/check-time-out', { 'ajax_request': true }, function (data) {
-            if (data.message === 'timeout') {
-                Functions.ajaxShowMessage(
-                    '<div class="alert alert-danger" role="alert">' +
-                    Messages.strTimeOutError +
-                    '</div>',
-                    false
-                );
+        $.get('index.php?route=/export/check-time-out',
+            {
+                'ajax_request': true,
+                'server': CommonParams.get('server')
+            },
+            function (data) {
+                if (data.message === 'timeout') {
+                    Functions.ajaxShowMessage(
+                        '<div class="alert alert-danger" role="alert">' +
+                        Messages.strTimeOutError +
+                        '</div>',
+                        false
+                    );
+                }
             }
-        });
+        );
     }, limit * 1000);
 };
 

diff --git a/js/src/home.js b/js/src/home.js
@@ -121,9 +121,15 @@ AJAX.registerTeardown('home.js', function () {
 
 AJAX.registerOnload('home.js', function () {
     $('#themesModal').on('show.bs.modal', function () {
-        $.get('index.php?route=/themes', function (data) {
-            $('#themesModal .modal-body').html(data.themes);
-        });
+        $.get(
+            'index.php?route=/themes',
+            {
+                'server': CommonParams.get('server'),
+            },
+            function (data) {
+                $('#themesModal .modal-body').html(data.themes);
+            }
+        );
     });
 
     /**