diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-11-15 21:27:24 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-11-15 21:27:24 +0100 |
| commit | f94d62380f06727a3a94114646f3cee6a221e1b2 (patch) | |
| tree | 1cc3fe892e69f693838f1fca727060f0bdba291f | |
| parent | cbcd9ba84ada830d91a6f1d7bee0ac59762835ed (diff) | |
| parent | 8a93cc14f66b6d2d725ae52ce0bf632a03fac59d (diff) | |
| download | nextcloud-server-f94d62380f06727a3a94114646f3cee6a221e1b2.tar.gz nextcloud-server-f94d62380f06727a3a94114646f3cee6a221e1b2.zip | |
Merge branch 'master' into filesystem
| -rw-r--r-- | apps/files/js/filelist.js | 2 | ||||
| -rw-r--r-- | lib/minimizer.php | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index ac2e0d63588..f754a7cd162 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -160,11 +160,11 @@ var FileList={ OC.dialogs.alert(result.data.message, 'Error moving file'); newname = name; } - tr.data('renaming',false); }); } } + tr.data('renaming',false); tr.attr('data-file', newname); var path = td.children('a.name').attr('href'); td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); diff --git a/lib/minimizer.php b/lib/minimizer.php index 33106245963..db522de74dc 100644 --- a/lib/minimizer.php +++ b/lib/minimizer.php @@ -30,6 +30,12 @@ abstract class OC_Minimizer { $cache->set($cache_key.'.gz', $gzout); OC_Response::setETagHeader($etag); } + // on some systems (e.g. SLES 11, but not Ubuntu) mod_deflate and zlib compression will compress the output twice. + // This results in broken core.css and core.js. To avoid it, we switch off zlib compression. + // Since mod_deflate is still active, Apache will compress what needs to be compressed, i.e. no disadvantage. + if(function_exists('apache_get_modules') && ini_get('zlib.output_compression') && in_array('mod_deflate', apache_get_modules())) { + ini_set('zlib.output_compression', 'Off'); + } if ($encoding = OC_Request::acceptGZip()) { header('Content-Encoding: '.$encoding); $out = $gzout; |