Some fixes to counting, still need to fix some access issues

diff --git a/mod/forum/index.php b/mod/forum/index.php
index e82ace35845ebf3b62e0d7e4ee6dec88a81f59eb..43450c2238f26da001407bf475649702820f4f92 100644 (file)
--- a/mod/forum/index.php
+++ b/mod/forum/index.php
@@ -106,7 +106,7 @@
             }
                 
             if ($groupmode == SEPARATEGROUPS and !isteacheredit($course->id)) {
-                $count = count_records("forum_discussions", "groupid", $currentgroup);
+                $count = count_records("forum_discussions", "forum", "$forum->id", "groupid", $currentgroup);
             } else {
                 $count = count_records("forum_discussions", "forum", "$forum->id");
             }
@@ -161,7 +161,7 @@
                 $groupmode = groupmode($course, $forum);  /// Can do this because forum->groupmode is defined
                 
                 if ($groupmode == SEPARATEGROUPS and !isteacheredit($course->id)) {
-                    $count = count_records("forum_discussions", "groupid", $currentgroup);
+                    $count = count_records("forum_discussions", "forum", "$forum->id", "groupid", $currentgroup);
                 } else {
                     $count = count_records("forum_discussions", "forum", "$forum->id");
                 }