L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-58712 core_user: Do not count the root directory

Browse Source
This commit is contained in:
Juan Leyva
2017-06-22 16:09:58 +02:00
committed by Eloy Lafuente (stronk7)
parent 828540b557
commit bef201c7e0
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filelib.php
+3 -6
View File
@@ -524,7 +524,7 @@ function file_get_draft_area_info($draftitemid, $filepath = '/') {
* 'filesize_without_references' => total size of the area excluding file references.
* @since Moodle 3.4
*/
function file_get_file_area_info($contextid, $component, $filearea, $itemid = false, $filepath = '/') {
function file_get_file_area_info($contextid, $component, $filearea, $itemid = 0, $filepath = '/') {
$fs = get_file_storage();
@@ -535,11 +535,8 @@ function file_get_file_area_info($contextid, $component, $filearea, $itemid = fa
'filesize_without_references' => 0
);
if ($filepath != '/') {
$draftfiles = $fs->get_directory_files($contextid, $component, $filearea, $itemid, $filepath, true, true);
} else {
$draftfiles = $fs->get_area_files($contextid, $component, $filearea, $itemid, 'id', true);
}
$draftfiles = $fs->get_directory_files($contextid, $component, $filearea, $itemid, $filepath, true, true);
foreach ($draftfiles as $file) {
if ($file->is_directory()) {
$results['foldercount'] += 1;