Whoops! Hide teacher discussions when printing list of user discussions

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 3027b9f03360ae60ece040e047f893b3546b308b..b2e09fe9ac148289aa6d35f89de5625e913353a5 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -437,10 +437,11 @@ function forum_delete_discussion($discussion) {
 function forum_print_user_discussions($courseid, $userid) {
     global $USER;
 
-    $discussions = get_records_sql("SELECT p.*, u.firstname, u.lastname, u.email, u.picture, u.id as userid
-                                    FROM forum_discussions d, forum_posts p, user u
+    $discussions = get_records_sql("SELECT p.*, u.firstname, u.lastname, u.email, u.picture, u.id as userid, f.type as forumtype
+                                    FROM forum_discussions d, forum_posts p, user u, forum f
                                     WHERE d.course = '$courseid' AND p.discussion = d.id AND 
-                                          p.parent = 0 AND p.user = u.id AND u.id = '$userid'
+                                          p.parent = 0 AND p.user = u.id AND u.id = '$userid' AND
+                                          d.forum = f.id
                                     ORDER BY p.created DESC");
     
     if ($discussions) {
@@ -448,6 +449,9 @@ function forum_print_user_discussions($courseid, $userid) {
         print_heading("Discussion topics");
         $replies = forum_count_discussion_replies();
         foreach ($discussions as $discussion) {
+            if (($discussion->forumtype == "teacher") and !isteacher($courseid)) {
+                continue;
+            }
             if ($replies[$discussion->discussion]) {
                 $discussion->replies = $replies[$discussion->discussion]->replies;
             } else {