summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorblizzz <blizzz@arthur-schiwon.de>2023-02-14 22:05:53 +0100
committerGitHub <noreply@github.com>2023-02-14 22:05:53 +0100
commit57d94830a23439f38825199380b9dfb8fb491043 (patch)
tree8e214c4ec06f622fd146295bea24f423393f26b8
parent20b11e4bf054ffaa2f470645fce6e422a50101cf (diff)
parent1010fbd2ed50ca5a4d50665970af7939d5024a95 (diff)
downloadnextcloud-server-57d94830a23439f38825199380b9dfb8fb491043.tar.gz
nextcloud-server-57d94830a23439f38825199380b9dfb8fb491043.zip
Merge pull request #36703 from nextcloud/backport/36700/stable24
[stable24] Also copy meta data when converting DataResponse to JSONReā€¦
-rw-r--r--lib/public/AppFramework/Controller.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php
index 12a6a75cf0f..a68e3951d91 100644
--- a/lib/public/AppFramework/Controller.php
+++ b/lib/public/AppFramework/Controller.php
@@ -92,6 +92,9 @@ abstract class Controller {
if ($data->getLastModified() !== null) {
$response->setLastModified($data->getLastModified());
}
+ if ($data->isThrottled()) {
+ $response->throttle($data->getThrottleMetadata());
+ }
return $response;
}