Stop injecting `forceBackgroundQueuePerform` into AJAX responses

diff --git a/ts/WoltLabSuite/Core/Ajax/DboAction.ts b/ts/WoltLabSuite/Core/Ajax/DboAction.ts
index d3367e4c5677a4baf3398ac1ba8863248f233e24..2f01d1dc93f9214ea2de5c514097dd0bee2190fb 100644 (file)
--- a/ts/WoltLabSuite/Core/Ajax/DboAction.ts
+++ b/ts/WoltLabSuite/Core/Ajax/DboAction.ts
@@ -23,7 +23,6 @@ import * as Core from "../Core";
 type Payload = Record<string, unknown>;
 type ResponseData = {
   actionName: string;
-  forceBackgroundQueuePerform?: boolean;
   objectIDs: number[];
   returnValues: unknown;
 };
@@ -148,7 +147,7 @@ export class DboAction {
         throw new InvalidJson(response);
       }
 
-      if (response.headers.get("woltlab-background-queue-check") === "yes" || json.forceBackgroundQueuePerform) {
+      if (response.headers.get("woltlab-background-queue-check") === "yes") {
         void import("../BackgroundQueue").then((BackgroundQueue) => BackgroundQueue.invoke());
       }
 

diff --git a/ts/WoltLabSuite/Core/Ajax/Request.ts b/ts/WoltLabSuite/Core/Ajax/Request.ts
index d56edf8d9405153601639c8d2368b7e68b1a7416..03a642d869043f2337f30af931328ba93adde767 100644 (file)
--- a/ts/WoltLabSuite/Core/Ajax/Request.ts
+++ b/ts/WoltLabSuite/Core/Ajax/Request.ts
@@ -250,10 +250,7 @@ class AjaxRequest {
         }
 
         // force-invoke the background queue
-        if (
-          xhr.getResponseHeader("woltlab-background-queue-check") === "yes" ||
-          (data && data.forceBackgroundQueuePerform)
-        ) {
+        if (xhr.getResponseHeader("woltlab-background-queue-check") === "yes") {
           void import("../BackgroundQueue").then((backgroundQueue) => backgroundQueue.invoke());
         }
       }

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/DboAction.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/DboAction.js
index 87787d915eb55b6b260d4b92e127dbc21759131d..1a6e163ae76718fea44a249e42122c0ece3e4fae 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/DboAction.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/DboAction.js
@@ -104,7 +104,7 @@ define(["require", "exports", "tslib", "./Error", "./Status", "../Core"], functi
                 catch (e) {
                     throw new Error_1.InvalidJson(response);
                 }
-                if (response.headers.get("woltlab-background-queue-check") === "yes" || json.forceBackgroundQueuePerform) {
+                if (response.headers.get("woltlab-background-queue-check") === "yes") {
                     void new Promise((resolve_1, reject_1) => { require(["../BackgroundQueue"], resolve_1, reject_1); }).then(tslib_1.__importStar).then((BackgroundQueue) => BackgroundQueue.invoke());
                 }
                 return json.returnValues;

diff --git a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
index e5357351d33bb0322ce94568e2c6811e1c13956b..b6d3be6097d69785d692a57f982748e32986ebf3 100644 (file)
--- a/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Ajax/Request.js
@@ -214,8 +214,7 @@ define(["require", "exports", "tslib", "./Status", "../Core", "../Dom/Change/Lis
                         data.returnValues.template = data.returnValues.template.trim();
                     }
                     // force-invoke the background queue
-                    if (xhr.getResponseHeader("woltlab-background-queue-check") === "yes" ||
-                        (data && data.forceBackgroundQueuePerform)) {
+                    if (xhr.getResponseHeader("woltlab-background-queue-check") === "yes") {
                         void new Promise((resolve_1, reject_1) => { require(["../BackgroundQueue"], resolve_1, reject_1); }).then(tslib_1.__importStar).then((backgroundQueue) => backgroundQueue.invoke());
                     }
                 }

diff --git a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
index fd50eba8c18507ca6bff306d0ca626884eeaf084..813ccf3e69af94df74e6e2ee14d48e6dad0130cd 100644 (file)
--- a/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
+++ b/wcfsetup/install/files/lib/action/AJAXProxyAction.class.php
@@ -114,11 +114,6 @@ class AJAXProxyAction extends AJAXInvokeAction
             }
         }
 
-        // force background queue invocation
-        if (!\class_exists(WCFACP::class, false) && WCF::getSession()->getVar('forceBackgroundQueuePerform')) {
-            $this->response['forceBackgroundQueuePerform'] = true;
-        }
-
         parent::sendResponse();
     }
 }