moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-27156 repositories: switched some spots over to using get_user_max_upload_file_size() instead of get_max_upload_file_size()

Browse source
This commit is contained in:
Andrew Davis 2012-06-08 17:23:47 +07:00
parent 8ac95c279c
commit 1812ea3e06
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
grade/grading/form/rubric/lib.php
View file

@ -453,7 +453,7 @@ class gradingform_rubric_controller extends gradingform_controller {
global $CFG; global $CFG;
return array( return array(
'maxfiles' => -1, 'maxfiles' => -1,
'maxbytes' => get_max_upload_file_size($CFG->maxbytes), 'maxbytes' => get_user_max_upload_file_size($context, $CFG->maxbytes),
'context' => $context, 'context' => $context,
); );
} }

2
lib/moodlelib.php
View file

@ -5844,7 +5844,7 @@ function get_max_upload_file_size($sitebytes=0, $coursebytes=0, $modulebytes=0)
/** /**
* Returns the maximum size for uploading files for the current user * Returns the maximum size for uploading files for the current user
* *
* This function calls @see:get_max_upload_file_size() then considers the user's capabilities * This function takes in account @see:get_max_upload_file_size() the user's capabilities
* *
* @param context $context The context in which to check user capabilities * @param context $context The context in which to check user capabilities
* @param int $sizebytes Set maximum size * @param int $sizebytes Set maximum size

2
mod/lesson/locallib.php
View file

@ -2114,7 +2114,7 @@ abstract class lesson_page extends lesson_base {
$context = $PAGE->context; $context = $PAGE->context;
} }
if ($maxbytes === null) { if ($maxbytes === null) {
$maxbytes =get_max_upload_file_size(); $maxbytes = get_user_max_upload_file_size($context);
} }
$properties = file_postupdate_standard_editor($properties, 'contents', array('noclean'=>true, 'maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$maxbytes), $context, 'mod_lesson', 'page_contents', $properties->id); $properties = file_postupdate_standard_editor($properties, 'contents', array('noclean'=>true, 'maxfiles'=>EDITOR_UNLIMITED_FILES, 'maxbytes'=>$maxbytes), $context, 'mod_lesson', 'page_contents', $properties->id);
$DB->update_record("lesson_pages", $properties); $DB->update_record("lesson_pages", $properties);