From: moodler <moodler>
Date: Tue, 17 Apr 2007 09:29:55 +0000 (+0000)
Subject: Merged some fixes for MDL-9402 from stable (causing forum unread counts to break)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=afc58a289b6781ad9d8aae8fddae8e181308c390;p=moodle.git

Merged some fixes for MDL-9402 from stable (causing forum unread counts to break)
---

diff --git a/course/format/lams/format.php b/course/format/lams/format.php
index 3fb6f646e9..4b1413c944 100644
--- a/course/format/lams/format.php
+++ b/course/format/lams/format.php
@@ -3,7 +3,6 @@
 // The main difference is that news forum is replaced by LAMS learner
 // interface.
 
-require_once($CFG->dirroot.'/mod/forum/lib.php');
 require_once($CFG->dirroot.'/mod/lams/constants.php');
 require_once($CFG->dirroot.'/lib/weblib.php');
 
diff --git a/course/format/social/format.php b/course/format/social/format.php
index 2b04117b1c..4a3566b3a6 100644
--- a/course/format/social/format.php
+++ b/course/format/social/format.php
@@ -2,8 +2,6 @@
       // format.php - course format featuring social forum
       //              included from view.php
 
-    require_once($CFG->dirroot.'/mod/forum/lib.php');
-
     // Bounds for block widths
     // more flexible for theme designers taken from theme config.php
     $lmin = (empty($THEME->block_l_min_width)) ? 100 : $THEME->block_l_min_width;
diff --git a/course/view.php b/course/view.php
index 8aa8663c5d..2bd8254061 100644
--- a/course/view.php
+++ b/course/view.php
@@ -6,6 +6,7 @@
     require_once('lib.php');
     require_once($CFG->libdir.'/blocklib.php');
     require_once($CFG->libdir.'/ajax/ajaxlib.php');
+    require_once($CFG->dirroot.'/mod/forum/lib.php');
 
     $id          = optional_param('id', 0, PARAM_INT);
     $name        = optional_param('name', '', PARAM_RAW);