Fix for the bug causing an error on the user activity page - made a

new function workshop_get_student_submission() based on the version
in 'assignment' ... haven't looked at the functionality yet.

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 69e17b3196d9715c42cc6e58767837bdd0e6491b..b093201fd5e1bfb9e7532981631f91ddab474b84 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -171,7 +171,7 @@ function workshop_delete_instance($id) {
 }
 
 function workshop_user_outline($course, $user, $mod, $workshop) {
-    if ($submission = workshop_get_submission($workshop, $user)) {
+    if ($submission = workshop_get_student_submission($workshop, $user)) {
         
         if ($submission->grade) {
             $result->info = get_string("grade").": $submission->grade";
@@ -183,7 +183,7 @@ function workshop_user_outline($course, $user, $mod, $workshop) {
 }
 
 function workshop_user_complete($course, $user, $mod, $workshop) {
-    if ($submission = workshop_get_submission($workshop, $user)) {
+    if ($submission = workshop_get_student_submission($workshop, $user)) {
         if ($basedir = workshop_file_area($workshop, $user)) {
             if ($files = get_directory_list($basedir)) {
                 $countfiles = count($files)." ".get_string("submissions", "workshop");
@@ -1053,6 +1053,17 @@ function workshop_get_student_submissions($workshop, $order = "title") {
                                                          ORDER BY $order");
 }
 
+function workshop_get_student_submission($workshop, $user) {
+// Return a submission for a particular user
+       global $CFG;
+
+    $submission = get_record("workshop_submissions", "workshopid", $workshop->id, "userid", $user->id);
+    if (!empty($submission->timemodified)) {
+        return $submission;
+    }
+    return NULL;
+}
+
 
 function workshop_get_submission_assessment($submission, $user) {
        // Return the user's assessment for this submission