Fixed up activity display for forums

diff --git a/mod/forum/lib.php b/mod/forum/lib.php
index b7811e1288c3be0ba0c617675953501d75c1cb5d..c3f0c4ee50ccc3a7dcc87026fe5b7cb27999ea37 100644 (file)
--- a/mod/forum/lib.php
+++ b/mod/forum/lib.php
@@ -482,11 +482,11 @@ function forum_user_summary($course, $user, $mod, $forum) {
 
 function forum_user_outline($course, $user, $mod, $forum) {
 
-///XXX
     global $CFG;
     if ($posts = get_records_sql("SELECT p.*, u.id as userid, u.firstname, u.lastname, u.email, u.picture
-                                  FROM forum_posts p, user u 
-                                  WHERE p.discussion='$discussion->id' AND p.user = '$user->id' AND p.user = u.id
+                                  FROM forum f, forum_discussions d, forum_posts p, user u 
+                                  WHERE f.id = '$forum->id' AND d.forum = f.id AND p.discussion = d.id
+                                  AND p.user = '$user->id' AND p.user = u.id
                                   ORDER BY p.modified ASC")) {
 
         $result->info = count($posts)." posts";
@@ -502,11 +502,11 @@ function forum_user_outline($course, $user, $mod, $forum) {
 function forum_user_complete($course, $user, $mod, $forum) {
     global $CFG;
 
-///XXX
     if ($posts = get_records_sql("SELECT p.*, u.id as userid, u.firstname, u.lastname, u.email, u.picture
-                                  FROM forum_posts p, user u 
-                                  WHERE p.discussion='$discussion->id' AND p.user = '$user->id' AND p.user = u.id
-                                  ORDER BY p.modified")) {
+                                  FROM forum f, forum_discussions d, forum_posts p, user u 
+                                  WHERE f.id = '$forum->id' AND d.forum = f.id AND p.discussion = d.id
+                                  AND p.user = '$user->id' AND p.user = u.id
+                                  ORDER BY p.modified ASC")) {
 
         foreach ($posts as $post) {
             if ($post->parent) {