Permalink
Browse files

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

…dle into MOODLE_22_STABLE
  • Loading branch information...
2 parents 1238c6f + 64171aa commit eab358f9161901ed6f89224f408560d5b13de387 @stronk7 stronk7 committed Aug 7, 2012
Showing with 10 additions and 12 deletions.
  1. +3 −3 lib/moodlelib.php
  2. +2 −5 repository/filepicker.php
  3. +5 −4 repository/repository_ajax.php
View
@@ -5739,15 +5739,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;
}
@@ -93,11 +93,8 @@
}
}
-$moodle_maxbytes = get_max_upload_file_size();
-// 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_max_upload_file_size($CFG->maxbytes, $coursemaxbytes, $maxbytes);
$params = array('ctx_id' => $contextid, 'itemid' => $itemid, 'env' => $env, 'course'=>$courseid, 'maxbytes'=>$maxbytes, 'maxfiles'=>$maxfiles, 'subdirs'=>$subdirs, 'sesskey'=>sesskey());
$params['action'] = 'browse';
@@ -83,11 +83,12 @@
/// Check permissions
repository::check_capability($contextid, $repository);
-$moodle_maxbytes = get_max_upload_file_size();
-// 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_max_upload_file_size($CFG->maxbytes, $coursemaxbytes, $maxbytes);
/// Wait as long as it takes for this script to finish
set_time_limit(0);

0 comments on commit eab358f

Please sign in to comment.