Merged fixes from stable

diff --git a/mod/journal/report.php b/mod/journal/report.php
index 0e5922a8a0eabacbfc10bc16b624f76d3a5aad2c..7e82e67c3abe51fbb45ea2dfbbf0c4e1bd14217d 100644 (file)
--- a/mod/journal/report.php
+++ b/mod/journal/report.php
@@ -70,9 +70,9 @@
         foreach ($feedback as $num => $vals) {
             $entry = $entrybyentry[$num];
             // Only update entries where feedback has actually changed.
-            if (($vals[r] <> $entry->rating) || ($vals[c] <> addslashes($entry->comment))) {
-                $newentry->rating     = $vals[r];
-                $newentry->comment    = $vals[c];
+            if (($vals['r'] <> $entry->rating) || ($vals['c'] <> addslashes($entry->comment))) {
+                $newentry->rating     = $vals['r'];
+                $newentry->comment    = $vals['c'];
                 $newentry->teacher    = $USER->id;
                 $newentry->timemarked = $timenow;
                 $newentry->mailed     = 0;           // Make sure mail goes out (again, even)
@@ -82,8 +82,8 @@
                 } else {
                     $count++;
                 }
-                $entrybyuser[$entry->userid]->rating     = $vals[r];
-                $entrybyuser[$entry->userid]->comment    = $vals[c];
+                $entrybyuser[$entry->userid]->rating     = $vals['r'];
+                $entrybyuser[$entry->userid]->comment    = $vals['c'];
                 $entrybyuser[$entry->userid]->teacher    = $USER->id;
                 $entrybyuser[$entry->userid]->timemarked = $timenow;
             }