Merge branch 'master' into remove_unused_vars
Conflicts: apps/files_encryption/lib/util.php
This commit is contained in:
commit
690bf9b8c4
File diff suppressed because it is too large
Load Diff
|
@ -93,6 +93,7 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
$('.undelete').click('click',function(event) {
|
||||
event.preventDefault();
|
||||
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'perform restore operation')+'" src="'+ OC.imagePath('core', 'loader.gif') +'"></a>';
|
||||
var files=getSelectedFiles('file');
|
||||
var fileslist = JSON.stringify(files);
|
||||
|
@ -117,6 +118,7 @@ $(document).ready(function() {
|
|||
});
|
||||
|
||||
$('.delete').click('click',function(event) {
|
||||
event.preventDefault();
|
||||
console.log("delete selected");
|
||||
var spinner = '<img class="move2trash" title="'+t('files_trashbin', 'Delete permanently')+'" src="'+ OC.imagePath('core', 'loading.gif') +'"></a>';
|
||||
var files=getSelectedFiles('file');
|
||||
|
|
|
@ -123,8 +123,11 @@ class OC_Files {
|
|||
header('Content-Length: ' . filesize($filename));
|
||||
self::addSendfileHeader($filename);
|
||||
}else{
|
||||
$filesize = \OC\Files\Filesystem::filesize($filename);
|
||||
header('Content-Type: '.\OC\Files\Filesystem::getMimeType($filename));
|
||||
header("Content-Length: ".\OC\Files\Filesystem::filesize($filename));
|
||||
if ($filesize > -1) {
|
||||
header("Content-Length: ".$filesize);
|
||||
}
|
||||
list($storage) = \OC\Files\Filesystem::resolvePath($filename);
|
||||
if ($storage instanceof \OC\Files\Storage\Local) {
|
||||
self::addSendfileHeader(\OC\Files\Filesystem::getLocalFile($filename));
|
||||
|
|
Loading…
Reference in New Issue