Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-54830-34' of https://github.com/snake/moodle into M…
…OODLE_34_STABLE
  • Loading branch information
David Monllao committed Jul 17, 2018
2 parents c650dd8 + 6a3aaf1 commit c0a2bba
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion course/externallib.php
Expand Up @@ -933,7 +933,11 @@ public static function update_courses($courses) {

// 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'])) {
Expand Down

0 comments on commit c0a2bba

Please sign in to comment.