From: martin <martin>
Date: Sun, 22 Sep 2002 03:05:39 +0000 (+0000)
Subject: Changes to not include deleted users in some things
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=ae2e0dddad7e1892c89100e762d3c64aca519ff5;p=moodle.git

Changes to not include deleted users in some things
---

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index 9ec505d40c..d2157fc5b2 100644
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -1005,7 +1005,7 @@ function forum_subscribed_users($course, $forum) {
     }
     return get_records_sql("SELECT u.* FROM user u, forum_subscriptions s
                             WHERE s.forum = '$forum->id'
-                              AND s.user = u.id");
+                              AND s.user = u.id AND u.deleted <> '1'");
 }
 
 function forum_subscribe($userid, $forumid) {
@@ -1297,13 +1297,15 @@ function forum_print_recent_activity(&$logs, $isteacher=false) {
                 $post = get_record_sql("SELECT p.*, d.forum, u.firstname, u.lastname, 
                                                u.email, u.picture, u.id as userid
                                         FROM forum_discussions d, forum_posts p, user u 
-                                        WHERE p.id = '$log->info' AND d.id = p.discussion AND p.user = u.id");
+                                        WHERE p.id = '$log->info' AND d.id = p.discussion 
+                                        AND p.user = u.id and u.deleted <> '1'");
 
             } else if ($log->action == "add discussion") {
                 $post = get_record_sql("SELECT p.*, d.forum, u.firstname, u.lastname, 
                                                u.email, u.picture, u.id as userid
                                         FROM forum_discussions d, forum_posts p, user u 
-                                        WHERE d.id = '$log->info' AND d.firstpost = p.id AND p.user = u.id");
+                                        WHERE d.id = '$log->info' AND d.firstpost = p.id 
+                                        AND p.user = u.id and u.deleted <> '1'");
             }
 
             if ($post) {