aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLukas Reschke <lukas@statuscode.ch>2017-03-30 10:47:28 +0200
committerGitHub <noreply@github.com>2017-03-30 10:47:28 +0200
commit1ee7e1c0b128b16c3327ca6aa90335ce12fd678f (patch)
tree51599ba67f3ab239a788a09b2969b1d1a5cc4507 /lib
parent85fcd420653c1a9c4de3380a386178ba76f3dfba (diff)
parent9813023aabfb37256dac4d2eea5574f91f8897e2 (diff)
downloadnextcloud-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 'lib')
-rw-r--r--lib/private/Template/JSCombiner.php4
-rw-r--r--lib/private/Template/SCSSCacher.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/private/Template/JSCombiner.php b/lib/private/Template/JSCombiner.php
index 0f30fb915f7..77c46a5e45e 100644
--- a/lib/private/Template/JSCombiner.php
+++ b/lib/private/Template/JSCombiner.php
@@ -155,9 +155,9 @@ class JSCombiner {
}
try {
- $gzipFile = $folder->getFile($fileName . '.gz');
+ $gzipFile = $folder->getFile($fileName . '.gzip'); # Safari doesn't like .gz
} catch (NotFoundException $e) {
- $gzipFile = $folder->newFile($fileName . '.gz');
+ $gzipFile = $folder->newFile($fileName . '.gzip'); # Safari doesn't like .gz
}
try {
diff --git a/lib/private/Template/SCSSCacher.php b/lib/private/Template/SCSSCacher.php
index df2e0232508..6e09f41a215 100644
--- a/lib/private/Template/SCSSCacher.php
+++ b/lib/private/Template/SCSSCacher.php
@@ -188,9 +188,9 @@ class SCSSCacher {
// Gzip file
try {
- $gzipFile = $folder->getFile($fileNameCSS . '.gz');
+ $gzipFile = $folder->getFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
} catch (NotFoundException $e) {
- $gzipFile = $folder->newFile($fileNameCSS . '.gz');
+ $gzipFile = $folder->newFile($fileNameCSS . '.gzip'); # Safari doesn't like .gz
}
try {