← Back to branch summary

~ubuntu-branches/ubuntu/trusty/moodle/trusty-proposed

« back to all changes in this revision

Viewing changes to mod/assignment/type/upload/upload.php

  • Committer: Package Import Robot
  • Author(s): Tomasz Muras
  • Date: 2012-11-15 21:50:13 UTC
  • mfrom: (1.1.9)
  • Revision ID: package-import@ubuntu.com-20121115215013-hmzkwz3v5hvm2a0a
Tags: 2.2.6.dfsg-1
New upstream version: 2.2.6 (Build: 20121112)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mod/assignment/type/upload/upload.php
59
59
$PAGE->set_heading($title);
60
60
 
61
61
$instance = new assignment_upload($cm->id, $assignment, $cm, $course);
62
 
$submission = $instance->get_submission($formdata->userid, true);
 
62
$submission = $instance->get_submission($formdata->userid, false);
63
63
 
64
64
$filemanager_options = array('subdirs'=>1, 'maxbytes'=>$assignment->maxbytes, 'maxfiles'=>$assignment->var1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
65
65
 
77
77
echo $OUTPUT->box_start('generalbox');
78
78
if ($instance->can_upload_file($submission) && ($id==null)) {
79
79
    $data = new stdClass();
 
80
    $submissionid = null;
 
81
    if (is_object($submission) && isset($submission->id)) {
 
82
        $submissionid = $submission->id;
 
83
    }
80
84
    // move submission files to user draft area
81
 
    $data = file_prepare_standard_filemanager($data, 'files', $filemanager_options, $context, 'mod_assignment', 'submission', $submission->id);
 
85
    $data = file_prepare_standard_filemanager($data, 'files', $filemanager_options, $context, 'mod_assignment', 'submission', $submissionid);
82
86
    // set file manager itemid, so it will find the files in draft area
83
87
    $mform->set_data($data);
84
88
    $mform->display();