MDL-78196 user: Fix files used space check

This commit is contained in:
Juan Leyva 2023-05-10 17:16:18 +02:00
parent 5d320dd7d1
commit e13a2ff501
2 changed files with 6 additions and 3 deletions

View File

@ -1212,8 +1212,10 @@ class core_user_external extends \core_external\external_api {
$maxbytes = USER_CAN_IGNORE_FILE_SIZE_LIMITS;
$maxareabytes = FILE_AREA_MAX_BYTES_UNLIMITED;
} else {
// Get current used space for this user.
$usedspace = file_get_user_used_space();
// Get current used space for this user (private files only).
$fileareainfo = file_get_file_area_info($context->id, 'user', 'private');
$usedspace = $fileareainfo['filesize_without_references'];
// Get the total size of the new files we want to add to private files.
$newfilesinfo = file_get_draft_area_info($params['draftid']);

View File

@ -1079,7 +1079,8 @@ class externallib_test extends externallib_advanced_testcase {
core_user_external::add_user_private_files($draftid);
// Force the quota so we are sure it won't be space to add the new file.
$CFG->userquota = file_get_user_used_space() + 1;
$fileareainfo = file_get_file_area_info($contextid, 'user', 'private');
$CFG->userquota = $fileareainfo['filesize_without_references'] + 1;
// Generate a new draftitemid for the same testfile.
$draftfile = core_files_external::upload($contextid, $component, $filearea, $itemid, $filepath,