From dadc740db5eb7a5641be842e10c283490fbf4c4d Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Wed, 25 Apr 2018 11:59:48 +0200 Subject: [PATCH] Use getType to determine type of entry Signed-off-by: Roeland Jago Douma --- apps/files_trashbin/lib/Sabre/TrashFolder.php | 4 ++-- apps/files_trashbin/lib/Sabre/TrashFolderFolder.php | 4 ++-- apps/files_trashbin/lib/Sabre/TrashHome.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/files_trashbin/lib/Sabre/TrashFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolder.php index 495c98c920..390f1956ff 100644 --- a/apps/files_trashbin/lib/Sabre/TrashFolder.php +++ b/apps/files_trashbin/lib/Sabre/TrashFolder.php @@ -51,7 +51,7 @@ class TrashFolder implements ICollection, ITrash { foreach ($entries as $entry) { if ($entry->getName() === $name) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolderFolder($this->getName(), $this->userId, $entry, $this->getOriginalLocation()); } return new TrashFolderFile($this->getName(), $this->userId, $entry, $this->getOriginalLocation()); @@ -63,7 +63,7 @@ class TrashFolder implements ICollection, ITrash { $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->getName(), $this->userId); $children = array_map(function (FileInfo $entry) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolderFolder($this->getName(), $this->userId, $entry, $this->getOriginalLocation()); } return new TrashFolderFile($this->getName(), $this->userId, $entry, $this->getOriginalLocation()); diff --git a/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php index 3607f90c56..435e1f0019 100644 --- a/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php +++ b/apps/files_trashbin/lib/Sabre/TrashFolderFolder.php @@ -64,7 +64,7 @@ class TrashFolderFolder implements ICollection, ITrash { foreach ($entries as $entry) { if ($entry->getName() === $name) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolderFolder($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation()); } return new TrashFolderFile($this->root . '/' . $this->getName(), $this->userId, $entry, $this->getOriginalLocation()); @@ -76,7 +76,7 @@ class TrashFolderFolder implements ICollection, ITrash { $entries = \OCA\Files_Trashbin\Helper::getTrashFiles($this->root . '/' . $this->getName(), $this->userId); $children = array_map(function (FileInfo $entry) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolderFolder($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation()); } return new TrashFolderFile($this->root.'/'.$this->getName(), $this->userId, $entry, $this->getOriginalLocation()); diff --git a/apps/files_trashbin/lib/Sabre/TrashHome.php b/apps/files_trashbin/lib/Sabre/TrashHome.php index 0a04755afc..4b2713ad69 100644 --- a/apps/files_trashbin/lib/Sabre/TrashHome.php +++ b/apps/files_trashbin/lib/Sabre/TrashHome.php @@ -75,7 +75,7 @@ class TrashHome implements ICollection { foreach ($entries as $entry) { if ($entry->getName() . '.d'.$entry->getMtime() === $name) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolder('/', $userId, $entry); } return new TrashFile($userId, $entry); @@ -91,7 +91,7 @@ class TrashHome implements ICollection { $entries = \OCA\Files_Trashbin\Helper::getTrashFiles('/', $userId); $children = array_map(function (FileInfo $entry) use ($userId) { - if ($entry->getMimetype() === 'httpd/unix-directory') { + if ($entry->getType() === FileInfo::TYPE_FOLDER) { return new TrashFolder('/', $userId, $entry); } return new TrashFile($userId, $entry);