diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-18 21:51:12 +0200 |
|---|---|---|
| committer | Roeland Jago Douma <roeland@famdouma.nl> | 2015-07-27 14:59:49 +0200 |
| commit | 88fb389eab368a9822e808eeffc23c4e1d2544e4 (patch) | |
| tree | 109f78a05c396316e418c6e7bbc920f2a6cae2f8 /lib | |
| parent | 9cdd637050a3a60ff58f78fff84088adce37051e (diff) | |
| download | nextcloud-server-88fb389eab368a9822e808eeffc23c4e1d2544e4.tar.gz nextcloud-server-88fb389eab368a9822e808eeffc23c4e1d2544e4.zip | |
Proper deprecate methods
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/files/type/detection.php | 3 | ||||
| -rw-r--r-- | lib/private/helper.php | 16 |
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 |