summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2014-03-03 13:51:49 +0100
committerRobin Appelman <icewind@owncloud.com>2014-03-03 13:51:49 +0100
commit9231195c98b5fc709903e8a0b639b882aa3f9ec8 (patch)
treed69aee76e163aa89e12fb45526275a0ef55b5bb6 /lib/private
parent3a21755963d8d9897a48ab58292345c0b710e239 (diff)
downloadnextcloud-server-9231195c98b5fc709903e8a0b639b882aa3f9ec8.tar.gz
nextcloud-server-9231195c98b5fc709903e8a0b639b882aa3f9ec8.zip
Fix FileInfo->getType
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/files/fileinfo.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index 2dbdd80a26b..916346b6082 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -144,10 +144,14 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
* @return \OCP\Files\FileInfo::TYPE_FILE | \OCP\Files\FileInfo::TYPE_FOLDER
*/
public function getType() {
- return $this->data['type'];
+ if ($this->data['type']) {
+ return $this->data['type'];
+ } else {
+ return $this->getMimetype() === 'httpd/unix-directory' ? self::TYPE_FOLDER : self::TYPE_FILE;
+ }
}
- public function getData(){
+ public function getData() {
return $this->data;
}