Merged fixes for latest news from 1.8 MDL-9308

diff --git a/blocks/news_items/block_news_items.php b/blocks/news_items/block_news_items.php
index a95612bbb819d852831aef307756194d73801844..8f46dfadebf5c4895d6b5d3e94fb5f449d28c563 100644 (file)
--- a/blocks/news_items/block_news_items.php
+++ b/blocks/news_items/block_news_items.php
@@ -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')) {

diff --git a/course/format/scorm/format.php b/course/format/scorm/format.php
index 5827f1bb8c949a562fdb733ef3e68b12dd12fff3..7c924a4eb557c9334b045c1986b029aa2ab9f7a3 100644 (file)
--- a/course/format/scorm/format.php
+++ b/course/format/scorm/format.php
@@ -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');
 

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 6b5bb3174d7a1b864fe23dd4284caa00fdeab0b5..507682759646da50d3b95a3bf54c954fdf2638c2 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.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

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 0f21c85af258e073d444fc5fe0e46c0cedcf135b..3f3cf960c8c5cffebd6d1fc5cd00ee9313278d47 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -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');

diff --git a/course/format/weekscss/format.php b/course/format/weekscss/format.php
index dfab9561212180f024ae64bb40554a437533ed6f..fec9bc6e677279f22758c709bcc7692d96fc4177 100644 (file)
--- a/course/format/weekscss/format.php
+++ b/course/format/weekscss/format.php
@@ -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');