From 23e3752b8d4f84a9b23db67446c638305c5dd44a Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 23 Apr 2014 12:39:58 +0200 Subject: Backport of #8197 to stable6 --- lib/connector/sabre/file.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'lib/connector') diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php index d3974be15a3..e90f86baa84 100644 --- a/lib/connector/sabre/file.php +++ b/lib/connector/sabre/file.php @@ -164,10 +164,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D */ public function getContentType() { if (isset($this->fileinfo_cache['mimetype'])) { - return $this->fileinfo_cache['mimetype']; + $mimeType = $this->fileinfo_cache['mimetype']; + } else { + $mimeType = \OC\Files\Filesystem::getMimeType($this->path); } - return \OC\Files\Filesystem::getMimeType($this->path); - + return \OC_Helper::getSecureMimeType($mimeType); } } -- cgit v1.2.3