Merged fixes from stable

This commit is contained in:
moodler 2004-08-30 06:29:54 +00:00
parent fbb869e97e
commit 36d9d5f70e

View file

@ -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;
}