summaryrefslogtreecommitdiffstats
path: root/lib/files
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2013-04-09 02:25:40 -0700
committerBernhard Posselt <nukeawhale@gmail.com>2013-04-09 02:25:40 -0700
commit8cd4cadb22dd732543be585c4703d1ad13656403 (patch)
tree5c6f236e5bc2d8671b9c531c69b58e54de1189c1 /lib/files
parent2d489a94c68bef0d7336f03fa5ae496b2a823de7 (diff)
parenta07a8794b89e865645d6e7ddd42922262d6995f5 (diff)
downloadnextcloud-server-8cd4cadb22dd732543be585c4703d1ad13656403.tar.gz
nextcloud-server-8cd4cadb22dd732543be585c4703d1ad13656403.zip
Merge pull request #2799 from owncloud/add-mimetype-filter-to-getdirectorycontent
Add mimetype filter to getDirectoryContent function
Diffstat (limited to 'lib/files')
-rw-r--r--lib/files/filesystem.php5
-rw-r--r--lib/files/view.php1
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/files/filesystem.php b/lib/files/filesystem.php
index 1580dfaf637..6f56de9f265 100644
--- a/lib/files/filesystem.php
+++ b/lib/files/filesystem.php
@@ -621,10 +621,11 @@ class Filesystem {
* get the content of a directory
*
* @param string $directory path under datadirectory
+ * @param string $mimetype_filter limit returned content to this mimetype or mimepart
* @return array
*/
- public static function getDirectoryContent($directory) {
- return self::$defaultInstance->getDirectoryContent($directory);
+ public static function getDirectoryContent($directory, $mimetype_filter = '') {
+ return self::$defaultInstance->getDirectoryContent($directory, $mimetype_filter);
}
/**
diff --git a/lib/files/view.php b/lib/files/view.php
index e811fb093cc..f607bb59aac 100644
--- a/lib/files/view.php
+++ b/lib/files/view.php
@@ -731,6 +731,7 @@ class View {
* get the content of a directory
*
* @param string $directory path under datadirectory
+ * @param string $mimetype_filter limit returned content to this mimetype or mimepart
* @return array
*/
public function getDirectoryContent($directory, $mimetype_filter = '') {