Filter subject lines in discussion listings too.

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 67a910cb122da853e875d1b7e78d3a4aeced6c1a..fe883295641ae53de7d2e505018c0dd50842638d 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -446,6 +446,9 @@ function forum_print_recent_activity($course, $isteacher, $timestart) {
                 $fullname = fullname($post, $isteacher);
                 echo "<p $teacheronly><font size=1>$date - $fullname<br>";
                 echo "\"<a href=\"$CFG->wwwroot/mod/forum/$log->url\">";
+                if (!empty($CFG->filterall)) {
+                    $post->subject = filter_text($post->subject, $course->id);
+                }
                 if ($log->action == "add discussion") {
                     echo "<b>$post->subject</b>";
                 } else {
@@ -1276,6 +1279,10 @@ function forum_print_post(&$post, $courseid, $ownpost=false, $reply=false, $link
 function forum_print_discussion_header(&$post, $courseid, $datestring="") {
     global $THEME, $USER, $CFG;
 
+    if (!empty($CFG->filterall)) {
+        $post->subject = filter_text($post->subject, $courseid);
+    }
+
     echo "<tr class=\"forumpostheader\">";
 
     // Topic
@@ -2089,6 +2096,9 @@ function forum_print_latest_discussions($forum_id=0, $forum_numdiscussions=5,
         }
         switch ($forum_style) {
             case "minimal":
+                if (!empty($CFG->filterall)) {
+                    $discussion->subject = filter_text($discussion->subject, $forum->course);
+                }
                 echo "<p><span class=\"smallinfohead\">".userdate($discussion->modified, $strftimerecent)." - $discussion->firstname</span><br />";
                 echo "<span class=\"smallinfo\">$discussion->subject ";
                 echo "<a href=\"$CFG->wwwroot/mod/forum/discuss.php?d=$discussion->discussion\">";