diff options
| author | Julius Härtl <jus@bitgrid.net> | 2017-05-17 10:10:40 +0200 |
|---|---|---|
| committer | Julius Härtl <jus@bitgrid.net> | 2017-05-17 10:11:29 +0200 |
| commit | edb5502b9d695f1eb12b58eac09d64d76339ec05 (patch) | |
| tree | 71da533e345628d15b9ece13f9991459f380f078 /apps | |
| parent | 1157f413c9a5c89994f0477b97726a2aef64e44e (diff) | |
| download | nextcloud-server-edb5502b9d695f1eb12b58eac09d64d76339ec05.tar.gz nextcloud-server-edb5502b9d695f1eb12b58eac09d64d76339ec05.zip | |
Add proper Content-Type to icons
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/theming/lib/Controller/IconController.php | 4 | ||||
| -rw-r--r-- | apps/theming/tests/Controller/IconControllerTest.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/theming/lib/Controller/IconController.php b/apps/theming/lib/Controller/IconController.php index cbd243a25e0..eb51d2d799c 100644 --- a/apps/theming/lib/Controller/IconController.php +++ b/apps/theming/lib/Controller/IconController.php @@ -141,7 +141,7 @@ class IconController extends Controller { $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png'; /** @var FileAccessHelper */ $fileAccessHelper = \OC::$server->query(FileAccessHelper::class); - $response = new DataDisplayResponse($fileAccessHelper->file_get_contents($fallbackLogo)); + $response = new DataDisplayResponse($fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']); } $response->cacheFor(86400); $expires = new \DateTime(); @@ -178,7 +178,7 @@ class IconController extends Controller { $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png'; /** @var FileAccessHelper */ $fileAccessHelper = \OC::$server->query(FileAccessHelper::class); - $response = new DataDisplayResponse($fileAccessHelper->file_get_contents($fallbackLogo)); + $response = new DataDisplayResponse($fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']); } $response->cacheFor(86400); $expires = new \DateTime(); diff --git a/apps/theming/tests/Controller/IconControllerTest.php b/apps/theming/tests/Controller/IconControllerTest.php index d93c2259472..0a93ce1f10d 100644 --- a/apps/theming/tests/Controller/IconControllerTest.php +++ b/apps/theming/tests/Controller/IconControllerTest.php @@ -152,7 +152,7 @@ class IconControllerTest extends TestCase { ->method('shouldReplaceIcons') ->willReturn(false); $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png'; - $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK); + $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']); $expected->cacheFor(86400); $expires = new \DateTime(); $expires->setTimestamp($this->timeFactory->getTime()); @@ -201,7 +201,7 @@ class IconControllerTest extends TestCase { ->method('shouldReplaceIcons') ->willReturn(false); $fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png'; - $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK); + $expected = new DataDisplayResponse(file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']); $expected->cacheFor(86400); $expires = new \DateTime(); $expires->setTimestamp($this->timeFactory->getTime()); |