From: stronk7 <stronk7>
Date: Sat, 26 Apr 2003 10:14:54 +0000 (+0000)
Subject: Show activity log only from visible journals. Bug #367.
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=2953d5e86534deffa932da6ba37ec871715da022;p=moodle.git

Show activity log only from visible journals. Bug #367.
---

diff --git a/mod/journal/lib.php b/mod/journal/lib.php
index 8fb6c2da92..67ed4d4027 100644
--- a/mod/journal/lib.php
+++ b/mod/journal/lib.php
@@ -128,10 +128,22 @@ function journal_print_recent_activity(&$logs, $isteacher=false) {
     foreach ($logs as $log) {
         if ($log->module == "journal") {
             if ($log->action == "add entry" or $log->action == "update entry") {
-                if (!isset($journals[$log->info])) {
-                    $journals[$log->info] = journal_log_info($log);
-                    $journals[$log->info]->time = $log->time;
-                    $journals[$log->info]->url = $log->url;
+                ///Get journal info.  I'll need it later
+                $j_log_info = journal_log_info($log);
+
+                //Create a temp valid module structure (course,id)
+                $tempmod->course = $log->course;
+                $tempmod->id = $j_log_info->id;
+                //Obtain the visible property from the instance
+                $modvisible = instance_is_visible($log->module,$tempmod);
+
+                //Only if the mod is visible
+                if ($modvisible) {
+                    if (!isset($journals[$log->info])) {
+                        $journals[$log->info] = $j_log_info;
+                        $journals[$log->info]->time = $log->time;
+                        $journals[$log->info]->url = $log->url;
+                    }
                 }
             }
         }