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 3fb6f646e95ca29867fd0ea0f626405aa1d82574..4b1413c944bca047c24d9a5796ba279acd6d3b11 100644 (file)
--- 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 2b04117b1c5133b99087b64d48e8fa6c3c8ab4fe..4a3566b3a672b75212a03983f193f50719998129 100644 (file)
--- 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 8aa8663c5d3d4831a2b1ffcc2d7f5385334037d7..2bd82540619d87b58d696bee2e42823ae695b6f1 100644 (file)
--- 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);