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

Merge branch 'MDL-54830-34' of https://github.com/snake/moodle into MOODLE_34_STABLE

Browse Source
This commit is contained in:
David Monllao
2018-07-17 13:55:20 +02:00
parent c650dd8568 6a3aaf1803
commit c0a2bba4e7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
course/externallib.php
+5 -1
View File
@@ -933,7 +933,11 @@ class core_course_external extends external_api {
// Make sure maxbytes are less then CFG->maxbytes.
if (array_key_exists('maxbytes', $course)) {
$course['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $course['maxbytes']);
// We allow updates back to 0 max bytes, a special value denoting the course uses the site limit.
// Otherwise, either use the size specified, or cap at the max size for the course.
if ($course['maxbytes'] != 0) {
$course['maxbytes'] = get_max_upload_file_size($CFG->maxbytes, $course['maxbytes']);
}
}
if (!empty($course['courseformatoptions'])) {