Merge branch 'MDL-35517_23' of git://github.com/stronk7/moodle into M…

…OODLE_23_STABLE
moodle · Sep 24, 2012 · 1e112f8 · 1e112f8
2 parents 3e8d7ca + 2974030
commit 1e112f8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/course/edit_form.php b/course/edit_form.php
@@ -156,7 +156,11 @@ function definition() {
         $mform->addHelpButton('showreports', 'showreports');
         $mform->setDefault('showreports', $courseconfig->showreports);
 
-        $choices = get_max_upload_sizes($CFG->maxbytes, 0, 0, $course->maxbytes);
+        // Handle non-existing $course->maxbytes on course creation.
+        $coursemaxbytes = !isset($course->maxbytes) ? null : $course->maxbytes;
+
+        // Let's prepare the maxbytes popup.
+        $choices = get_max_upload_sizes($CFG->maxbytes, 0, 0, $coursemaxbytes);
         $mform->addElement('select', 'maxbytes', get_string('maximumupload'), $choices);
         $mform->addHelpButton('maxbytes', 'maximumupload');
         $mform->setDefault('maxbytes', $courseconfig->maxbytes);