aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSebastian Krupinski <165827823+SebastianKrupinski@users.noreply.github.com>2024-12-13 12:31:26 -0500
committerGitHub <noreply@github.com>2024-12-13 12:31:26 -0500
commitafc4b0aea5103fad469bd27d1d199778f956291c (patch)
tree130bdd17661f45ba185ac89a997bcaa54dde4391 /apps
parent10852d38e345eab68035a2442f3a76b5c5e7bf1a (diff)
parent0628eb62f3724bf84f5506f1df5e1a32f76754a4 (diff)
downloadnextcloud-server-afc4b0aea5103fad469bd27d1d199778f956291c.tar.gz
nextcloud-server-afc4b0aea5103fad469bd27d1d199778f956291c.zip
Merge pull request #49839 from nextcloud/fix/issue-3021-return-no-content-instead-of-error
fix: return 204 instead of 404
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/CardDAV/ImageExportPlugin.php2
-rw-r--r--apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/ImageExportPlugin.php b/apps/dav/lib/CardDAV/ImageExportPlugin.php
index e9d390d0849..8a950202c08 100644
--- a/apps/dav/lib/CardDAV/ImageExportPlugin.php
+++ b/apps/dav/lib/CardDAV/ImageExportPlugin.php
@@ -90,7 +90,7 @@ class ImageExportPlugin extends ServerPlugin {
$response->setBody($file->getContent());
} catch (NotFoundException $e) {
- $response->setStatus(404);
+ $response->setStatus(\OCP\AppFramework\Http::STATUS_NO_CONTENT);
}
return false;
diff --git a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
index 6718153f910..cf6ddb1ff7b 100644
--- a/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
+++ b/apps/dav/tests/unit/CardDAV/ImageExportPluginTest.php
@@ -171,7 +171,7 @@ class ImageExportPluginTest extends TestCase {
->willThrowException(new NotFoundException());
$this->response->expects($this->once())
->method('setStatus')
- ->with(404);
+ ->with(\OCP\AppFramework\Http::STATUS_NO_CONTENT);
}
$result = $this->plugin->httpGet($this->request, $this->response);