Fixed Bugs #1059 and #1061.

diff --git a/mod/workshop/lib.php b/mod/workshop/lib.php
index 5897942ca4527a90c98cbe50e4676818003dee17..feac553d585d2d0613c5b0d66f1b57a909a780cb 100644 (file)
--- a/mod/workshop/lib.php
+++ b/mod/workshop/lib.php
@@ -2095,43 +2095,45 @@ function workshop_list_student_submissions($workshop, $user) {
                                $nassessments[$submission->id] = $n + rand(0, 98) / 100;
                                }
                                
-                       // put the submissions with the lowest number of assessments first
-                       asort($nassessments);
-                       reset($nassessments);
-                       $nsassessments = $workshop->nsassessments;
-                       foreach ($nassessments as $submissionid =>$n) {
-                               // only use those submissions which fall below the allocation threshold
-                               if ($n < ($workshop->nsassessments + $workshop->overallocation)) {
-                                       $comment = "";
-                                       $submission = get_record("workshop_submissions", "id", $submissionid);
-                                       // skip submission if it belongs to this user
-                                       if ($submission->userid != $user->id) {
-                                               // add a "hot" assessment record if user has NOT already assessed this submission
-                                               if (!get_record("workshop_assessments", "submissionid", $submission->id, "userid",
-                                    $user->id)) {
-                                                       $yearfromnow = time() + 365 * 86400;
-                                                       // ...create one and set timecreated way in the future, this is reset when record is updated
-                                                       $assessment->workshopid = $workshop->id;
-                                                       $assessment->submissionid = $submission->id;
-                                                       $assessment->userid = $user->id;
-                                                       $assessment->grade = -1; // set impossible grade
-                                                       $assessment->timecreated = $yearfromnow;
-                                                       if (!$assessment->id = insert_record("workshop_assessments", $assessment)) {
-                                                               error("List Student submissions: Could not insert workshop assessment!");
-                                                               }
-                                                       $nassessed++;
-                                                       // is user up to quota?
-                                                       if ($nassessed == $nsassessments) {
-                                                               break;
-                                                               }
-                                                       }
-                                               }
-                                       }
-                               }
+            if (isset($nassessments)) { // make sure we end up with something to play with :-)
+                // put the submissions with the lowest number of assessments first
+                asort($nassessments);
+                reset($nassessments);
+                $nsassessments = $workshop->nsassessments;
+                foreach ($nassessments as $submissionid =>$n) {
+                    // only use those submissions which fall below the allocation threshold
+                    if ($n < ($workshop->nsassessments + $workshop->overallocation)) {
+                        $comment = "";
+                        $submission = get_record("workshop_submissions", "id", $submissionid);
+                        // skip submission if it belongs to this user
+                        if ($submission->userid != $user->id) {
+                            // add a "hot" assessment record if user has NOT already assessed this submission
+                            if (!get_record("workshop_assessments", "submissionid", $submission->id, "userid",
+                                        $user->id)) {
+                                $yearfromnow = time() + 365 * 86400;
+                                // ...create one and set timecreated way in the future, this is reset when record is updated
+                                $assessment->workshopid = $workshop->id;
+                                $assessment->submissionid = $submission->id;
+                                $assessment->userid = $user->id;
+                                $assessment->grade = -1; // set impossible grade
+                                $assessment->timecreated = $yearfromnow;
+                                if (!$assessment->id = insert_record("workshop_assessments", $assessment)) {
+                                    error("List Student submissions: Could not insert workshop assessment!");
+                                }
+                                $nassessed++;
+                                // is user up to quota?
+                                if ($nassessed == $nsassessments) {
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                }
                        }
                }
-       // now list the student submissions this user has been allocated, list only the hot and warm ones, the cold ones
-       // are listed in the "your assessments list" (_list_assessed submissions)
+    }
+       // now list the student submissions this user has been allocated, list only the hot and warm ones, 
+    // the cold ones are listed in the "your assessments list" (_list_assessed submissions)
        if ($assessments = workshop_get_user_assessments($workshop, $user)) {
                $timenow = time();
                foreach ($assessments as $assessment) {

diff --git a/mod/workshop/submissions.php b/mod/workshop/submissions.php
index b05b2b1c44d55258bb859b1eec6ad654f0caf6f0..333f54c5f79daa87520ae402dce370c8f2ee3a9a 100644 (file)
--- a/mod/workshop/submissions.php
+++ b/mod/workshop/submissions.php
@@ -1025,7 +1025,8 @@
                                        }
                                }
                        else { // funny this user did not submit - create a dummy submission to hold any grades they might have
-                               $bestsubmission->workshopid = $workshop->id;
+                               unset($bestsubmission);
+                $bestsubmission->workshopid = $workshop->id;
                                $bestsubmission->userid = $user->id;
                                $bestsubmission->title = "No Submission";
                                $bestsubmission->timecreated = 0;