From 45c38eef4c2d381bac73082766111413f805086b Mon Sep 17 00:00:00 2001 From: vyshane Date: Tue, 22 Aug 2006 07:38:01 +0000 Subject: [PATCH] Removed deprecated forum type teacher. --- mod/forum/discuss.php | 10 ++-------- mod/forum/view.php | 9 +-------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/mod/forum/discuss.php b/mod/forum/discuss.php index a08e5fa18ff..545944a36dc 100644 --- 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 9b6c0f5d9bf..c2f6e8e7cd6 100644 --- 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);