Merge branch 'MDL-32861-21' of https://github.com/mackensen/moodle into MOODLE_21_STABLE

This commit is contained in:
Aparup Banerjee
2012-05-15 16:18:53 +08:00
+2 -1
View File
@@ -273,7 +273,8 @@ function form_filemanager_render($options) {
$extra = '';
}
$maxsize = get_string('maxfilesize', 'moodle', display_size(get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes)));
$options->maxbytes = get_max_upload_file_size($CFG->maxbytes, $course_maxbytes, $options->maxbytes);
$maxsize = get_string('maxfilesize', 'moodle', display_size($options->maxbytes));
$loading = get_string('loading', 'repository');
$html .= <<<FMHTML
<div class="filemanager-loading mdl-align" id='filemanager-loading-{$client_id}'>