Merge branch 'MDL-35728' of git://github.com/netspotau/moodle-mod_assign

robjoyce · Oct 8, 2012 · d26a3d2 · d26a3d2
2 parents af312fd + 21f7739
commit d26a3d2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/mod/assign/locallib.php b/mod/assign/locallib.php
@@ -1779,16 +1779,20 @@ private function download_submissions() {
                 if ($this->get_instance()->teamsubmission) {
                     $submission = $this->get_group_submission($userid, 0, false);
                     $submissiongroup = $this->get_submission_group($userid);
-                    $groupname = '-' . $submissiongroup->name;
+                    if ($submissiongroup) {
+                        $groupname = $submissiongroup->name . '-';
+                    } else {
+                        $groupname = get_string('defaultteam', 'assign') . '-';
+                    }
                 } else {
                     $submission = $this->get_user_submission($userid, false);
                 }
 
                 if ($this->is_blind_marking()) {
-                    $prefix = clean_filename(str_replace('_', ' ', get_string('participant', 'assign') . $groupname) .
+                    $prefix = clean_filename(str_replace('_', ' ', $groupname . get_string('participant', 'assign')) .
                                              "_" . $this->get_uniqueid_for_user($userid) . "_");
                 } else {
-                    $prefix = clean_filename(str_replace('_', ' ', fullname($student) . $groupname) .
+                    $prefix = clean_filename(str_replace('_', ' ', $groupname . fullname($student)) .
                                              "_" . $this->get_uniqueid_for_user($userid) . "_");
                 }