Permalink
Browse files

Merge branch 'MDL-54830-master' of https://github.com/snake/moodle

  • Loading branch information...
dmonllao authored and andrewnicols committed Jul 17, 2018
2 parents 98b5b9d + bdd410a commit 1f9964a6e034d444613ce20b820106aee0f77d7b
Showing with 5 additions and 1 deletion.
  1. +5 −1 course/externallib.php
@@ -941,7 +941,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'])) {

0 comments on commit 1f9964a

Please sign in to comment.