From ecdf88e41b898889fe8e05bb9c05415dd6b03a95 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 17 Dec 2015 17:07:48 +0100
Subject: Use proper public API for OC_Helper::getFileNameMimeType

---
 lib/private/files/objectstore/objectstorestorage.php | 2 +-
 lib/private/files/storage/common.php                 | 2 +-
 lib/private/helper.php                               | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

(limited to 'lib/private')

diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index 5ec05a3529e..a053ea6d6d2 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -329,7 +329,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 			$stat['mtime'] = $mtime;
 			$this->getCache()->update($stat['fileid'], $stat);
 		} else {
-			$mimeType = \OC_Helper::getFileNameMimeType($path);
+			$mimeType = \OC::$server->getMimeTypeDetector()->detectPath($path);
 			// create new file
 			$stat = array(
 				'etag' => $this->getETag($path),
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index b06543d0a6a..091f2edb629 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -225,7 +225,7 @@ abstract class Common implements Storage {
 		if ($this->is_dir($path)) {
 			return 'httpd/unix-directory';
 		} elseif ($this->file_exists($path)) {
-			return \OC_Helper::getFileNameMimeType($path);
+			return \OC::$server->getMimeTypeDetector()->detectPath($path);
 		} else {
 			return false;
 		}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 779a67a2340..c13ac1990dd 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -348,14 +348,6 @@ class OC_Helper {
 		return !file_exists($dir);
 	}
 
-	/**
-	 * @return \OC\Files\Type\Detection
-	 * @deprecated 8.2.0 use \OC::$server->getMimeTypeDetector()
-	 */
-	static public function getMimetypeDetector() {
-		return \OC::$server->getMimeTypeDetector();
-	}
-
 	/**
 	 * @return \OC\Files\Type\TemplateManager
 	 */
-- 
cgit v1.2.3