Don't always use arraymerge in journal_get_users_done() - was causing

bad data sometimes ...

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 1e120b248b525073d088f0d33e1cdab67eeb32e9..9bcfc92a68f6ebc38851bb39221ec8bcc6afe136 100644 (file)
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -305,6 +305,15 @@ function journal_get_users_done($journal) {
                                    AND j.journal = $journal->id
                                    AND t.course = $journal->course)
                               ORDER BY j.modified DESC");
+    if ($studentjournals and !$teacherjournals) {
+        return $studentjournals;
+    }
+    if ($teacherjournals and !$studentjournals) {
+        return $teacherjournals;
+    }
+    if (!$teacherjournals and !$studentjournals) {
+        return array();
+    }
     return(array_merge($studentjournals, $teacherjournals));
 }