mirror of
https://github.com/moodle/moodle.git
synced 2025-01-18 05:58:34 +01:00
Merged fixes for latest news from 1.8 MDL-9308
This commit is contained in:
parent
3e0647ffaf
commit
1519aa2b71
@ -25,7 +25,7 @@ class block_news_items extends block_base {
|
||||
if ($COURSE->newsitems) { // Create a nice listing of recent postings
|
||||
|
||||
require_once($CFG->dirroot.'/mod/forum/lib.php'); // We'll need this
|
||||
|
||||
|
||||
$text = '';
|
||||
|
||||
if (!$forum = forum_get_course_forum($COURSE->id, 'news')) {
|
||||
|
@ -2,7 +2,6 @@
|
||||
// format.php - course format featuring single activity
|
||||
// included from view.php
|
||||
|
||||
require_once("$CFG->dirroot/mod/forum/lib.php");
|
||||
$module = $course->format;
|
||||
require_once($CFG->dirroot.'/mod/'.$module.'/locallib.php');
|
||||
|
||||
|
@ -7,10 +7,8 @@
|
||||
// Included from "view.php"
|
||||
|
||||
|
||||
require_once($CFG->dirroot.'/mod/forum/lib.php');
|
||||
require_once($CFG->libdir.'/ajax/ajaxlib.php');
|
||||
|
||||
|
||||
$topic = optional_param('topic', -1, PARAM_INT);
|
||||
|
||||
// Bounds for block widths
|
||||
|
@ -2,7 +2,6 @@
|
||||
// Display the whole course as "weeks" made of of modules
|
||||
// Included from "view.php"
|
||||
|
||||
require_once("$CFG->dirroot/mod/forum/lib.php");
|
||||
require_once($CFG->libdir.'/ajax/ajaxlib.php');
|
||||
|
||||
$week = optional_param('week', -1, PARAM_INT);
|
||||
@ -34,10 +33,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
if ($course->newsitems) {
|
||||
$news = forum_get_course_forum($course->id, 'news');
|
||||
}
|
||||
|
||||
$streditsummary = get_string('editsummary');
|
||||
$stradd = get_string('add');
|
||||
$stractivities = get_string('activities');
|
||||
|
@ -25,8 +25,6 @@
|
||||
*/
|
||||
//TODO (nfreear): Accessibility: evaluation, lang/en_utf8/moodle.php: $string['formatweekscss']
|
||||
|
||||
require_once("$CFG->dirroot/mod/forum/lib.php");
|
||||
|
||||
$week = optional_param('week', -1, PARAM_INT);
|
||||
|
||||
if ($week != -1) {
|
||||
@ -39,10 +37,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
if ($course->newsitems) {
|
||||
$news = forum_get_course_forum($course->id, 'news');
|
||||
}
|
||||
|
||||
$streditsummary = get_string('editsummary');
|
||||
$stradd = get_string('add');
|
||||
$stractivities = get_string('activities');
|
||||
|
Loading…
x
Reference in New Issue
Block a user