summaryrefslogtreecommitdiffstats
path: root/lib/files.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-08-17 01:22:26 +0200
committerRobin Appelman <icewind@owncloud.com>2012-08-17 01:22:54 +0200
commit53a888cc8130a81961dece245b35a226be4d67ab (patch)
treef5b709bb728ad16c1f68baa4cd64807f3f269b02 /lib/files.php
parent70e8a7e25c40834830b0237f279d15f82dcd2a9e (diff)
downloadnextcloud-server-53a888cc8130a81961dece245b35a226be4d67ab.tar.gz
nextcloud-server-53a888cc8130a81961dece245b35a226be4d67ab.zip
more path normalization
Diffstat (limited to 'lib/files.php')
-rw-r--r--lib/files.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/files.php b/lib/files.php
index d5bebb7e549..b9c2ead9443 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -33,6 +33,10 @@ class OC_Files {
* @param dir $directory path under datadirectory
*/
public static function getDirectoryContent($directory, $mimetype_filter = ''){
+ $directory=OC_Filesystem::normalizePath($directory);
+ if($directory=='/'){
+ $directory='';
+ }
$files=OC_FileCache::getFolderContent($directory, false, $mimetype_filter);
foreach($files as &$file){
$file['directory']=$directory;