TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added an option to suppress folders in the MediaLibrary::listFolderContents() calls. Fixes #2016

This commit is contained in:
Aleksey Bobkov 2017-01-12 17:40:08 -08:00
parent 4b3ab44bab
commit 5415e64cf3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/cms/classes/MediaLibrary.php
View File

@ -76,9 +76,10 @@ class MediaLibrary
* Supported values are 'title', 'size', 'lastModified' (see SORT_BY_XXX class constants) and FALSE.
* @param string $filter Determines the document type filtering preference.
* Supported values are 'image', 'video', 'audio', 'document' (see FILE_TYPE_XXX constants of MediaLibraryItem class).
* @param boolean $ignoreFolders Determines whether folders should be suppressed in the result list.
* @return array Returns an array of MediaLibraryItem objects.
*/
public function listFolderContents($folder = '/', $sortBy = 'title', $filter = null)
public function listFolderContents($folder = '/', $sortBy = 'title', $filter = null, $ignoreFolders = false)
{
$folder = self::validatePath($folder);
$fullFolderPath = $this->getMediaPath($folder);
@ -119,7 +120,12 @@ class MediaLibrary
$this->filterItemList($folderContents['files'], $filter);
$folderContents = array_merge($folderContents['folders'], $folderContents['files']);
if (!$ignoreFolders) {
$folderContents = array_merge($folderContents['folders'], $folderContents['files']);
}
else {
$folderContents = $folderContents['files'];
}
return $folderContents;
}