Merge pull request #36706 from nextcloud/backport/36700/stable21

blizzz · web-flow · commit 80a1e24ea15e · 2023-02-14T22:08:07.000+01:00
[stable21] Also copy meta data when converting DataResponse to JSONRe…
diff --git a/lib/public/AppFramework/Controller.php b/lib/public/AppFramework/Controller.php
@@ -98,6 +98,9 @@ public function __construct($appName,
 					if ($data->getLastModified() !== null) {
 						$response->setLastModified($data->getLastModified());
 					}
+					if ($data->isThrottled()) {
+						$response->throttle($data->getThrottleMetadata());
+					}
 
 					return $response;
 				}

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,9 @@ public function __construct($appName,`
`98`	`98`	`if ($data->getLastModified() !== null) {`
`99`	`99`	`$response->setLastModified($data->getLastModified());`
`100`	`100`	`}`
	`101`	`+ if ($data->isThrottled()) {`
	`102`	`+ $response->throttle($data->getThrottleMetadata());`
	`103`	`+ }`
`101`	`104`
`102`	`105`	`return $response;`
`103`	`106`	`}`