Removed deprecated forum type teacher.

diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php
index a08e5fa18ff85c4cae6883bd5e3cf8d0228e8fe0..545944a36dcb0fcf65089ed9c59d8b10f5c6e99e 100644 (file)
--- a/mod/forum/discuss.php
+++ b/mod/forum/discuss.php
@@ -141,14 +141,8 @@
 /// Also, if we know they should be able to reply, then explicitly set $canreply
 
     $canreply = NULL;   /// No override one way or the other
-
-    if ($forum->type == "teacher") {
-        $groupmode = NOGROUPS;
-    } else {
-        $groupmode = groupmode($course, $cm);
-    }
-
-                                       
+    $groupmode = groupmode($course, $cm);
+    
     
     if ($groupmode and !has_capability('moodle/site:accessallgroups', $modcontext)) {   // Groups must be kept separate
         //change this to ismember

diff --git a/mod/forum/view.php b/mod/forum/view.php
index 9b6c0f5d9bf1faa03fbd7a9b77a8b2ee8eae91ec..c2f6e8e7cd635979bfcf93c4a889f3c46ffc7643 100644 (file)
--- a/mod/forum/view.php
+++ b/mod/forum/view.php
@@ -82,14 +82,7 @@
     }
 
 
-/// Check to see if groups are being used in this forum
-/// and if so, set $currentgroup to reflect the current group
-
-    if ($forum->type == "teacher") {
-        $groupmode = NOGROUPS;
-    } else {
-        $groupmode = groupmode($course, $cm);   // Groups are being used
-    }
+    $groupmode = groupmode($course, $cm);
     
     $currentgroup = get_and_set_current_group($course, $groupmode, $changegroup);