summaryrefslogtreecommitdiffstats
path: root/lib/private/Template
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2017-03-29 00:11:51 -0600
committerMorris Jobke <hey@morrisjobke.de>2017-03-29 00:11:51 -0600
commit9813023aabfb37256dac4d2eea5574f91f8897e2 (patch)
tree5a8fc5c3113df74b566ccc1878d5e243d8e49233 /lib/private/Template
parent05f25963117f4829f5eae3c23d0e4c40cdbc0abf (diff)
downloadnextcloud-server-9813023aabfb37256dac4d2eea5574f91f8897e2.tar.gz
nextcloud-server-9813023aabfb37256dac4d2eea5574f91f8897e2.zip
Fix gzip files for Safari
* Safari support gzip only if the filename does not end on .gz - so this renames them to .gzip Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/Template')
-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 {