mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into filesystem

This commit is contained in:
Robin Appelman 2012-11-15 21:27:24 +01:00
parent cbcd9ba84a 8a93cc14f6
commit f94d62380f
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/filelist.js
View File

@ -160,11 +160,11 @@ var FileList={
OC.dialogs.alert(result.data.message, 'Error moving file'); OC.dialogs.alert(result.data.message, 'Error moving file');
newname = name; newname = name;
} }
tr.data('renaming',false);
}); });
} }
} }
tr.data('renaming',false);
tr.attr('data-file', newname); tr.attr('data-file', newname);
var path = td.children('a.name').attr('href'); var path = td.children('a.name').attr('href');
td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname))); td.children('a.name').attr('href', path.replace(encodeURIComponent(name), encodeURIComponent(newname)));

6
lib/minimizer.php
View File

@ -30,6 +30,12 @@ abstract class OC_Minimizer {
$cache->set($cache_key.'.gz', $gzout); $cache->set($cache_key.'.gz', $gzout);
OC_Response::setETagHeader($etag); 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()) { if ($encoding = OC_Request::acceptGZip()) {
header('Content-Encoding: '.$encoding); header('Content-Encoding: '.$encoding);
$out = $gzout; $out = $gzout;