Permalink
Browse files

Merge branch 'MDL-32861-22' of https://github.com/mackensen/moodle in…

…to MOODLE_22_STABLE
  • Loading branch information...
2 parents 1eab78b + 2d129fb commit 479f14a07be473e1179ae7c6255b9d0117426f26 @nebgor nebgor committed May 15, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 lib/form/filemanager.php
View
@@ -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}'>

0 comments on commit 479f14a

Please sign in to comment.