mirror of
https://github.com/moodle/moodle.git
synced 2025-04-14 13:02:07 +02:00
Merged some fixes for MDL-9402 from stable (causing forum unread counts to break)
This commit is contained in:
parent
a32fa3588a
commit
afc58a289b
@ -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');
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user