Merged from stable

diff --git a/blocks/course_summary/block_course_summary.php b/blocks/course_summary/block_course_summary.php
index a65774c329f9189d24ea2079c0e7633f538923fe..ff911cf1db389c4749eeb592dd36c5ec64180a49 100644 (file)
--- a/blocks/course_summary/block_course_summary.php
+++ b/blocks/course_summary/block_course_summary.php
@@ -24,7 +24,8 @@ class CourseBlock_course_summary extends MoodleBlock {
         }
 
         $this->content = New stdClass;
-        $this->content->text = format_text($this->course->summary, FORMAT_HTML);
+        $options->noclean = true;    // Don't clean Javascripts etc
+        $this->content->text = format_text($this->course->summary, FORMAT_HTML, $options);
         if (isediting($this->course->id)) {
             if (empty($this->course->category)) {
                 $editpage = $CFG->wwwroot.'/admin/site.php';