Merge branch 'MDL-29400_misleading_file_upload_status' of git://github.com/gerrywastaken/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-12-22 09:48:23 +01:00
commit 91c10ddfa0
2 changed files with 2 additions and 2 deletions

View File

@ -1069,7 +1069,7 @@ class assignment_upload extends assignment_base {
}
// If the user has submitted something add some related links and data
if ($submission->data2 == 'submitted') {
if (isset($submission->data2) AND $submission->data2 == 'submitted') {
// Add a view link to the settings nav
$link = new moodle_url('/mod/assignment/view.php', array('id'=>$this->cm->id));
$node->add(get_string('viewmysubmission', 'assignment'), $link, navigation_node::TYPE_SETTING);

View File

@ -319,7 +319,7 @@ class assignment_uploadsingle extends assignment_base {
}
// If the user has submitted something add some related links and data
if ($submission->numfiles) {
if (isset($submission->numfiles) AND $submission->numfiles) {
// Add a view link to the settings nav
$link = new moodle_url('/mod/assignment/view.php', array('id'=>$this->cm->id));
$node->add(get_string('viewmysubmission', 'assignment'), $link, navigation_node::TYPE_SETTING);