summaryrefslogtreecommitdiffstats
path: root/lib/filestorage
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-01-30 20:29:33 +0100
committerRobin Appelman <icewind@owncloud.com>2012-01-30 20:29:33 +0100
commit4522d19b4c214676b8a0d4067c3a2d1bc63618bc (patch)
tree68725926f48072805e321f3507237df33814472a /lib/filestorage
parent355262635838860f5f17b2cf20132adddd7af77e (diff)
parent45038af948cd07ffc74efc8d4b0282fa11b7de7e (diff)
downloadnextcloud-server-4522d19b4c214676b8a0d4067c3a2d1bc63618bc.tar.gz
nextcloud-server-4522d19b4c214676b8a0d4067c3a2d1bc63618bc.zip
merge master into filesystem
Diffstat (limited to 'lib/filestorage')
-rw-r--r--lib/filestorage/local.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index dcffce6e867..61343652f61 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -36,7 +36,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
public function filetype($path){
$filetype=filetype($this->datadir.$path);
if($filetype=='link'){
- $filetype=filetype(readlink($this->datadir.$path));
+ $filetype=filetype(realpath($this->datadir.$path));
}
return $filetype;
}