From: moodler <moodler>
Date: Fri, 30 Jan 2004 01:57:00 +0000 (+0000)
Subject: Don't always use arraymerge in journal_get_users_done() - was causing
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5c09be163c5800e5d5ae15f528060e6f89c4f30f;p=moodle.git

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 1e120b248b..9bcfc92a68 100644
--- 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));
 }