Teacher forum never has groups

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index fe01c40aa5a4d00fe46cabf79eb2b56684708622..0dc54660972ef81d547e3a5f80bffa132d65b8e7 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -117,7 +117,11 @@
 
     $canreply = NULL;   /// No override one way or the other
 
-    $groupmode = groupmode($course, $cm);
+    if ($forum->type == "teacher") {
+        $groupmode = NOGROUPS;
+    } else {
+        $groupmode = groupmode($course, $cm);
+    }
 
     if ($groupmode and !isteacheredit($course->id)) {   // Groups must be kept separate
         if ($groupmode == SEPARATEGROUPS) {

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 4aa876cfae22206609d3343e254464d73093170d..f6e253e55c981d837abc6bb8a6d4cb71d379d41a 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -89,7 +89,12 @@
 /// and if so, set $currentgroup to reflect the current group
 
     $changegroup = isset($_GET['group']) ? $_GET['group'] : -1;  // Group change requested?
-    $groupmode = groupmode($course, $cm);   // Groups are being used
+
+    if ($forum->type == "teacher") {
+        $groupmode = NOGROUPS;
+    } else {
+        $groupmode = groupmode($course, $cm);   // Groups are being used
+    }
     $currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);
 
     if ($groupmode and ($currentgroup === false) and !isteacheredit($course->id)) {