diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-04-10 22:44:13 -0400 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-04-10 22:44:13 -0400 |
| commit | 613e15035e3f02a212c9f3ec11ae98fc3ef682c8 (patch) | |
| tree | 4b6b93ceb338ae8abd7253faf41526e41ae72d74 /lib/files.php | |
| parent | ef1e359c7c10f4ebd8230b4fa79bd0b284b5186e (diff) | |
| parent | 9f547a1b3987838fda8db238a8999c9f474bb542 (diff) | |
| download | nextcloud-server-613e15035e3f02a212c9f3ec11ae98fc3ef682c8.tar.gz nextcloud-server-613e15035e3f02a212c9f3ec11ae98fc3ef682c8.zip | |
Merge branch 'master' into sabredav_1.6
Diffstat (limited to 'lib/files.php')
| -rw-r--r-- | lib/files.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files.php b/lib/files.php index e7bfbbc19bb..a68c29ad989 100644 --- a/lib/files.php +++ b/lib/files.php @@ -32,11 +32,11 @@ class OC_Files { * get the content of a directory * @param dir $directory */ - public static function getDirectoryContent($directory){ + public static function getDirectoryContent($directory, $mimetype_filter = ''){ if(strpos($directory,OC::$CONFIG_DATADIRECTORY)===0){ $directory=substr($directory,strlen(OC::$CONFIG_DATADIRECTORY)); } - $files=OC_FileCache::getFolderContent($directory); + $files=OC_FileCache::getFolderContent($directory, '', $mimetype_filter); foreach($files as &$file){ $file['directory']=$directory; $file['type']=($file['mimetype']=='httpd/unix-directory')?'dir':'file'; |