From 7030756a983960e69abb3feecf387b5ae414d23e Mon Sep 17 00:00:00 2001 From: Rajesh Taneja Date: Wed, 18 Jul 2012 16:33:18 +0800 Subject: [PATCH] MDL-30792 Files API: maxbytes will be set by get_max_upload_file_size if less then 0 or greater then max moodle limit --- repository/filepicker.php | 4 ++-- repository/repository_ajax.php | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/repository/filepicker.php b/repository/filepicker.php index 73970d60a28..568cd6d1519 100644 --- a/repository/filepicker.php +++ b/repository/filepicker.php @@ -89,9 +89,9 @@ if ($repo_id) { } $context = context::instance_by_id($contextid); -$moodle_maxbytes = get_user_max_upload_file_size($context); +$moodle_maxbytes = get_user_max_upload_file_size($context, $CFG->maxbytes, $course->maxbytes); // to prevent maxbytes greater than moodle maxbytes setting -if ($maxbytes == 0 || $maxbytes>=$moodle_maxbytes) { +if (($maxbytes <= 0) || ($maxbytes >= $moodle_maxbytes)) { $maxbytes = $moodle_maxbytes; } diff --git a/repository/repository_ajax.php b/repository/repository_ajax.php index 5c368778430..84c92ce9abd 100644 --- a/repository/repository_ajax.php +++ b/repository/repository_ajax.php @@ -78,10 +78,13 @@ $repo = repository::get_repository_by_id($repo_id, $contextid, $repooptions); // Check permissions $repo->check_capability(); - -$moodle_maxbytes = get_user_max_upload_file_size($context); +$coursemaxbytes = 0; +if (!empty($course)) { + $coursemaxbytes = $course->maxbytes; +} +$moodle_maxbytes = get_user_max_upload_file_size($context, $CFG->maxbytes, $coursemaxbytes); // to prevent maxbytes greater than moodle maxbytes setting -if ($maxbytes == 0 || $maxbytes>=$moodle_maxbytes) { +if (($maxbytes <= 0) || ($maxbytes >= $moodle_maxbytes)) { $maxbytes = $moodle_maxbytes; }