Merge branch 'MDL-37972-master' of git://github.com/phalacee/moodle

This commit is contained in:
Marina Glancy 2013-12-16 12:27:38 +11:00
commit 2a73cfb011

View file

@ -378,7 +378,7 @@ class assignment_uploadsingle extends assignment_base {
foreach ($files as $file) { foreach ($files as $file) {
$filename = $file->get_filename(); $filename = $file->get_filename();
$mimetype = $file->get_mimetype(); $mimetype = $file->get_mimetype();
$link = file_encode_url($CFG->wwwroot.'/pluginfile.php', '/'.$this->context->id.'/mod_assignment', 'submission/'.$submission->id.'/'.$filename); $link = moodle_url::make_pluginfile_url($this->context->id, 'mod_assignment', 'submission', $submission->id, $file->get_filepath(), $filename);
$filenode->add($filename, $link, navigation_node::TYPE_SETTING, null, null, new pix_icon(file_file_icon($file), '')); $filenode->add($filename, $link, navigation_node::TYPE_SETTING, null, null, new pix_icon(file_file_icon($file), ''));
} }
} }