L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-33686_options' of git://github.com/andyjdavis/moodle

Browse Source
This commit is contained in:
Sam Hemelryk
2012-07-02 14:53:31 +12:00
parent e07a3bf209 648aad913a
commit 103a53473f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
files/renderer.php
+2 -2
View File
@@ -455,10 +455,10 @@ class core_files_renderer extends plugin_renderer_base {
*/
private function fm_print_restrictions($fm) {
$maxbytes = display_size($fm->options->maxbytes);
if (empty($options->maxfiles) || $options->maxfiles == -1) {
if (empty($fm->options->maxfiles) || $fm->options->maxfiles == -1) {
$maxsize = get_string('maxfilesize', 'moodle', $maxbytes);
} else {
$strparam = (object)array('size' => $maxbytes, 'attachments' => $options->maxfiles);
$strparam = (object)array('size' => $maxbytes, 'attachments' => $fm->options->maxfiles);
$maxsize = get_string('maxsizeandattachments', 'moodle', $strparam);
}
// TODO MDL-32020 also should say about 'File types accepted'