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

Merge pull request #11684 from owncloud/guess_mimetype_on_touch 

guess mimetype on touch
This commit is contained in:
Jörn Friedrich Dreyer 2014-10-22 12:32:09 +02:00
parent b7718bc212 1c9004409b
commit a9aa7841c9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_external/lib/amazons3.php
View File

@ -457,11 +457,13 @@ class AmazonS3 extends \OC\Files\Storage\Common {
)); ));
$this->testTimeout(); $this->testTimeout();
} else { } else {
$mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
$this->connection->putObject(array( $this->connection->putObject(array(
'Bucket' => $this->bucket, 'Bucket' => $this->bucket,
'Key' => $this->cleanKey($path), 'Key' => $this->cleanKey($path),
'Metadata' => $metadata, 'Metadata' => $metadata,
'Body' => '' 'Body' => '',
'ContentType' => $mimeType
)); ));
$this->testTimeout(); $this->testTimeout();
} }

3
apps/files_external/lib/swift.php
View File

@ -406,7 +406,8 @@ class Swift extends \OC\Files\Storage\Common {
$object->saveMetadata($metadata); $object->saveMetadata($metadata);
return true; return true;
} else { } else {
$customHeaders = array('content-type' => 'text/plain'); $mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
$customHeaders = array('content-type' => $mimeType);
$metadataHeaders = DataObject::stockHeaders($metadata); $metadataHeaders = DataObject::stockHeaders($metadata);
$allHeaders = $customHeaders + $metadataHeaders; $allHeaders = $customHeaders + $metadataHeaders;
$this->container->uploadObject($path, '', $allHeaders); $this->container->uploadObject($path, '', $allHeaders);