Add proper Content-Type to icons

Signed-off-by: Julius Härtl <jus@bitgrid.net>
pull/4888/head
Julius Härtl 9 years ago
parent 1157f413c9
commit edb5502b9d
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
  1. 4
      apps/theming/lib/Controller/IconController.php
  2. 4
      apps/theming/tests/Controller/IconControllerTest.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();

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

Loading…
Cancel
Save