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

MDL-39077 fix regression in previous commit, the limit should be always included in maxbytes

Browse Source
This commit is contained in:
Petr Škoda
2013-04-27 16:00:59 +02:00
parent 7adfadc6b8
commit 5520fc9526
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/moodlelib.php
+6 -1
View File
@@ -6225,7 +6225,6 @@ function get_max_upload_sizes($sitebytes = 0, $coursebytes = 0, $modulebytes = 0
}
}
krsort($filesize, SORT_NUMERIC);
$limitlevel = '';
$displaysize = '';
if ($modulebytes &&
@@ -6233,14 +6232,20 @@ function get_max_upload_sizes($sitebytes = 0, $coursebytes = 0, $modulebytes = 0
($modulebytes < $sitebytes || $sitebytes == 0))) {
$limitlevel = get_string('activity', 'core');
$displaysize = display_size($modulebytes);
$filesize[$modulebytes] = $displaysize; // Make sure the limit is also included in the list.
} else if ($coursebytes && ($coursebytes < $sitebytes || $sitebytes == 0)) {
$limitlevel = get_string('course', 'core');
$displaysize = display_size($coursebytes);
$filesize[$coursebytes] = $displaysize; // Make sure the limit is also included in the list.
} else if ($sitebytes) {
$limitlevel = get_string('site', 'core');
$displaysize = display_size($sitebytes);
$filesize[$sitebytes] = $displaysize; // Make sure the limit is also included in the list.
}
krsort($filesize, SORT_NUMERIC);
if ($limitlevel) {
$params = (object) array('contextname'=>$limitlevel, 'displaysize'=>$displaysize);
$filesize = array('0'=>get_string('uploadlimitwithsize', 'core', $params)) + $filesize;