diff options
| author | Robin Appelman <icewind@owncloud.com> | 2014-04-15 22:05:43 +0400 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2014-04-15 22:05:43 +0400 |
| commit | 295b75cca91273c7145379cc479fa84ac14c8dd1 (patch) | |
| tree | 22a0600b558449d08434decb8b498c581b48ed22 /lib/private/connector | |
| parent | c82adb8c5db01d6a49c4364f7eecb2931f59cfa1 (diff) | |
| parent | ffab31e3ee491b89f2263ee60497526fab5f61f5 (diff) | |
merge master into webdav-injection
Diffstat (limited to 'lib/private/connector')
| -rw-r--r-- | lib/private/connector/sabre/file.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php index cbecd90b7d6..a9de41adf4d 100644 --- a/lib/private/connector/sabre/file.php +++ b/lib/private/connector/sabre/file.php @@ -191,7 +191,9 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D * @return mixed */ public function getContentType() { - return $this->info->getMimetype(); + $mimeType = $this->info->getMimetype(); + + return \OC_Helper::getSecureMimeType($mimeType); } /** |