Merge branch 'MDL-44626-master' of git://github.com/andrewnicols/moodle

This commit is contained in:
Dan Poltawski 2016-02-15 10:36:20 +00:00
commit 220f8115d9
4 changed files with 13 additions and 6 deletions

View file

@ -6192,7 +6192,7 @@ function get_user_max_upload_file_size($context, $sitebytes = 0, $coursebytes =
}
if (has_capability('moodle/course:ignorefilesizelimits', $context, $user)) {
return USER_CAN_IGNORE_FILE_SIZE_LIMITS;
return get_max_upload_file_size(USER_CAN_IGNORE_FILE_SIZE_LIMITS);
}
return get_max_upload_file_size($sitebytes, $coursebytes, $modulebytes);