upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-19 02:38:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Add proper Content-Type to icons

Browse source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2017-05-17 10:10:40 +02:00
parent 1157f413c9
commit edb5502b9d
No known key found for this signature in database
GPG key ID: 4C614C6ED2CDE6DF
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/theming/lib/Controller/IconController.php
View file

@ -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();

4
apps/theming/tests/Controller/IconControllerTest.php
View file

@ -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());