MDL-35454 ignore invalid $custombytes in get_max_upload_sizes()

This fixes installation and phpunit init regression.
This commit is contained in:
Petr Škoda
2012-09-17 00:09:19 +02:00
parent 4db36990ee
commit 14e497c06e
+7 -4
View File
@@ -5824,16 +5824,19 @@ function get_max_upload_sizes($sitebytes = 0, $coursebytes = 0, $modulebytes = 0
return array();
}
$filesize = array();
$filesize[intval($maxsize)] = display_size($maxsize);
$sizelist = array(10240, 51200, 102400, 512000, 1048576, 2097152,
5242880, 10485760, 20971520, 52428800, 104857600);
// If custombytes is given then add it to the list.
if (!is_null($custombytes)) {
if (is_number($custombytes)) {
$custombytes = array((int)$custombytes);
// If custombytes is given and is valid then add it to the list.
if (is_number($custombytes) and $custombytes > 0) {
$custombytes = (int)$custombytes;
if (!in_array($custombytes, $sizelist)) {
$sizelist[] = $custombytes;
}
} else if (is_array($custombytes)) {
$sizelist = array_unique(array_merge($sizelist, $custombytes));
}