Skip to content
Browse files

Merge branch 'wip-mdl-30792-m23' of git://github.com/rajeshtaneja/moo…

…dle into MOODLE_23_STABLE
  • Loading branch information...
2 parents ed10bfb + 6ecbaca commit 02d6791d05967cb0c5a26a617d86ad5e5fc7b4c2 @stronk7 stronk7 committed Aug 8, 2012
Showing with 11 additions and 12 deletions.
  1. +3 −3 lib/moodlelib.php
  2. +3 −5 repository/filepicker.php
  3. +5 −4 repository/repository_ajax.php
View
6 lib/moodlelib.php
@@ -5842,15 +5842,15 @@ function get_max_upload_file_size($sitebytes=0, $coursebytes=0, $modulebytes=0)
}
}
- if ($sitebytes and $sitebytes < $minimumsize) {
+ if (($sitebytes > 0) and ($sitebytes < $minimumsize)) {
$minimumsize = $sitebytes;
}
- if ($coursebytes and $coursebytes < $minimumsize) {
+ if (($coursebytes > 0) and ($coursebytes < $minimumsize)) {
$minimumsize = $coursebytes;
}
- if ($modulebytes and $modulebytes < $minimumsize) {
+ if (($modulebytes > 0) and ($modulebytes < $minimumsize)) {
$minimumsize = $modulebytes;
}
View
8 repository/filepicker.php
@@ -89,11 +89,9 @@
}
$context = context::instance_by_id($contextid);
-$moodle_maxbytes = get_user_max_upload_file_size($context);
-// to prevent maxbytes greater than moodle maxbytes setting
-if ($maxbytes == 0 || $maxbytes>=$moodle_maxbytes) {
- $maxbytes = $moodle_maxbytes;
-}
+
+// Make sure maxbytes passed is within site filesize limits.
+$maxbytes = get_user_max_upload_file_size($context, $CFG->maxbytes, $course->maxbytes, $maxbytes);
$params = array('ctx_id' => $contextid, 'itemid' => $itemid, 'env' => $env, 'course'=>$courseid, 'maxbytes'=>$maxbytes, 'maxfiles'=>$maxfiles, 'subdirs'=>$subdirs, 'sesskey'=>sesskey());
$params['action'] = 'browse';
View
9 repository/repository_ajax.php
@@ -79,11 +79,12 @@
// Check permissions
$repo->check_capability();
-$moodle_maxbytes = get_user_max_upload_file_size($context);
-// to prevent maxbytes greater than moodle maxbytes setting
-if ($maxbytes == 0 || $maxbytes>=$moodle_maxbytes) {
- $maxbytes = $moodle_maxbytes;
+$coursemaxbytes = 0;
+if (!empty($course)) {
+ $coursemaxbytes = $course->maxbytes;
}
+// Make sure maxbytes passed is within site filesize limits.
+$maxbytes = get_user_max_upload_file_size($context, $CFG->maxbytes, $coursemaxbytes, $maxbytes);
// Wait as long as it takes for this script to finish
set_time_limit(0);

0 comments on commit 02d6791

Please sign in to comment.
Something went wrong with that request. Please try again.