diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-30 10:47:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 10:47:28 +0200 |
| commit | 1ee7e1c0b128b16c3327ca6aa90335ce12fd678f (patch) | |
| tree | 51599ba67f3ab239a788a09b2969b1d1a5cc4507 /core | |
| parent | 85fcd420653c1a9c4de3380a386178ba76f3dfba (diff) | |
| parent | 9813023aabfb37256dac4d2eea5574f91f8897e2 (diff) | |
| download | nextcloud-server-1ee7e1c0b128b16c3327ca6aa90335ce12fd678f.tar.gz nextcloud-server-1ee7e1c0b128b16c3327ca6aa90335ce12fd678f.zip | |
Merge pull request #4132 from nextcloud/fix-safari-gzip
Fix gzip files for Safari
Diffstat (limited to 'core')
| -rw-r--r-- | core/Controller/CssController.php | 2 | ||||
| -rw-r--r-- | core/Controller/JsController.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/Controller/CssController.php b/core/Controller/CssController.php index b467d386f98..57197e9999e 100644 --- a/core/Controller/CssController.php +++ b/core/Controller/CssController.php @@ -95,7 +95,7 @@ class CssController extends Controller { if ($encoding !== null && strpos($encoding, 'gzip') !== false) { try { $gzip = true; - return $folder->getFile($fileName . '.gz'); + return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz } catch (NotFoundException $e) { // continue } diff --git a/core/Controller/JsController.php b/core/Controller/JsController.php index 0b50abc158a..c7c9dea9101 100644 --- a/core/Controller/JsController.php +++ b/core/Controller/JsController.php @@ -96,7 +96,7 @@ class JsController extends Controller { if ($encoding !== null && strpos($encoding, 'gzip') !== false) { try { $gzip = true; - return $folder->getFile($fileName . '.gz'); + return $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz } catch (NotFoundException $e) { // continue } |