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

"MDL-21102, fixed fatal php error in file picker"

Browse source
This commit is contained in:
Dongsheng Cai 2009-12-15 08:00:11 +00:00
parent 75b1018cd3
commit 6926df754e
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
repository/local/repository.class.php
View file

@ -158,12 +158,13 @@ class repository_local extends repository {
$filename = $params['filename']; $filename = $params['filename'];
$fileitemid = $params['itemid']; $fileitemid = $params['itemid'];
$context = get_context_instance_by_id($contextid); $context = get_context_instance_by_id($contextid);
$file_info = $browser->get_file_info($context, $filearea, $fileitemid, $filepath, $filename); $file_info = $browser->get_file_info($context, $filearea, $fileitemid, $filepath, $filename);
$file_info->copy_to_storage($user_context->id, 'user_draft', $itemid, $save_path, $title); $file_info->copy_to_storage($user_context->id, 'user_draft', $itemid, $save_path, $title);
$ret['itemid'] = $itemid; $ret['itemid'] = $itemid;
$ret['title'] = $title; $ret['title'] = $title;
$ret['contextid'] = $user_context->id; $ret['contextid'] = $user_context->id;
$ret['filesize'] = $file_info->get_filesize();
return $ret; return $ret;
} }

2
repository/repository_ajax.php
View file

@ -237,7 +237,7 @@ EOD;
$info['file'] = $fileinfo['title']; $info['file'] = $fileinfo['title'];
$info['id'] = $itemid; $info['id'] = $itemid;
$info['url'] = $CFG->httpswwwroot.'/draftfile.php/'.$fileinfo['contextid'].'/user_draft/'.$itemid.'/'.$fileinfo['title']; $info['url'] = $CFG->httpswwwroot.'/draftfile.php/'.$fileinfo['contextid'].'/user_draft/'.$itemid.'/'.$fileinfo['title'];
$filesize = $fileinfo->get_filesize(); $filesize = $fileinfo['filesize'];
if (($maxbytes!==-1) && ($filesize > $maxbytes)) { if (($maxbytes!==-1) && ($filesize > $maxbytes)) {
$fileinfo->delete(); $fileinfo->delete();
throw new file_exception('maxbytes'); throw new file_exception('maxbytes');