summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/private/files/type/detection.php3
-rw-r--r--lib/private/helper.php16
2 files changed, 5 insertions, 14 deletions
diff --git a/lib/private/files/type/detection.php b/lib/private/files/type/detection.php
index d69b52bba3d..7c6c87250e2 100644
--- a/lib/private/files/type/detection.php
+++ b/lib/private/files/type/detection.php
@@ -262,8 +262,7 @@ class Detection implements IMimeTypeDetector {
return $this->mimetypeIcons[$mimetype];
}
if ($mimetype === 'dir-external') {
- $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.
-png');
+ $this->mimetypeIcons[$mimetype] = $this->urlGenerator->imagePath('core', 'filetypes/folder-external.png');
return $this->mimetypeIcons[$mimetype];
}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index c30c11dc840..b8e4b451835 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -394,7 +394,7 @@ class OC_Helper {
*
* @param string $path
* @return string
- * @deprecated Use \OC::$server->getMimeTypeDetector()->detectPath($path)
+ * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detectPath($path)
*/
static public function getFileNameMimeType($path) {
return \OC::$server->getMimeTypeDetector()->detectPath($path);
@@ -406,7 +406,7 @@ class OC_Helper {
* @param string $path
* @return string
* does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
- * @deprecated Use \OC::$server->getMimeTypeDetector()->detect($path)
+ * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detect($path)
*/
static function getMimeType($path) {
return \OC::$server->getMimeTypeDetector()->detect($path);
@@ -417,7 +417,7 @@ class OC_Helper {
*
* @param string $mimeType
* @return string
- * @deprecated Use \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType)
+ * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType)
*/
static function getSecureMimeType($mimeType) {
return \OC::$server->getMimeTypeDetector()->getSecureMimeType($mimeType);
@@ -428,21 +428,13 @@ class OC_Helper {
*
* @param string $data
* @return string
- * @deprecated Use \OC::$server->getMimeTypeDetector()->detectString($data)
+ * @deprecated 8.2.0 Use \OC::$server->getMimeTypeDetector()->detectString($data)
*/
static function getStringMimeType($data) {
return \OC::$server->getMimeTypeDetector()->detectString($data);
}
/**
- * Checks $_REQUEST contains a var for the $s key. If so, returns the html-escaped value of this var; otherwise returns the default value provided by $d.
- * @param string $s name of the var to escape, if set.
- * @param string $d default value.
- * @return string the print-safe value.
- *
- */
-
- /**
* detect if a given program is found in the search PATH
*
* @param string $name