MDL-23308, fixed maxbytes setting in filemanager

sbourget · Sep 13, 2010 · c8f0b53 · c8f0b53
1 parent e2620b9
commit c8f0b53
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
@@ -258,14 +258,24 @@ function form_filemanager_render($options) {
 
     $client_id = $options->client_id;
     $itemid    = $options->itemid;
+    list($context, $course, $cm) = get_context_info_array($options->context->id);
+    if (is_object($course)) {
+        $course_maxbytes = $course->maxbytes;
+    } else {
+        $course_maxbytes = $CFG->maxbytes;
+    }
+
+    if ($options->maxbytes == -1 || empty($options->maxbytes)) {
+        $options->maxbytes = $CFG->maxbytes;
+    }
 
     if (empty($options->filecount)) {
         $extra = ' style="display:none"';
     } else {
         $extra = '';
     }
 
-    $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, 0, $options->maxbytes)));
+    $maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes)));
     $html .= <<<FMHTML
 <div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>
 $icon_progress