Merged fixes for over-keen cleaning from STABLE

diff --git a/course/format/topics/format.php b/course/format/topics/format.php
index 8fee54e5468c27a716159108ab475dea847a4caa..1883ec24b3acfbb68dc17a72ca57372fa6967942 100644 (file)
--- a/course/format/topics/format.php
+++ b/course/format/topics/format.php
@@ -102,7 +102,8 @@
         echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"topicsoutlineside\" valign=top width=20>&nbsp;</td>";
         echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"topicsoutlinecontent\" width=\"100%\">";
 
-        echo format_text($thissection->summary, FORMAT_HTML);
+        $summaryformatoptions->noclean = true;
+        echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
 
         if (isediting($course->id)) {
             echo "<a title=\"$streditsummary\" ".
@@ -193,7 +194,8 @@
             } else {
                 echo '<td id="section_'.($section).'" style="vertical-align:top; width: 100%;" '.$colormain.'>';
 
-                echo format_text($thissection->summary, FORMAT_HTML);
+                $summaryformatoptions->noclean = true;
+                echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
 
                 if (isediting($course->id)) {
                     echo " <a title=\"$streditsummary\" href=editsection.php?id=$thissection->id>".

diff --git a/course/format/weeks/format.php b/course/format/weeks/format.php
index 074cbe0fa953211efe2f3e67a23b3ce1efc04929..43f43e020a1ee3617647941fe1b9b1457aa6fddc 100644 (file)
--- a/course/format/weeks/format.php
+++ b/course/format/weeks/format.php
@@ -91,7 +91,8 @@
         echo "<td nowrap bgcolor=\"$THEME->cellheading\" class=\"weeklyoutlineside\" valign=top width=20>&nbsp;</td>";
         echo "<td valign=top bgcolor=\"$THEME->cellcontent\" class=\"weeklyoutlinecontent\" width=\"100%\">";
 
-        echo format_text($thissection->summary, FORMAT_HTML);
+        $summaryformatoptions->noclean = true;
+        echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
 
         if (isediting($course->id)) {
             echo " <a title=\"$streditsummary\" ".
@@ -186,7 +187,8 @@
     
                 echo "<p class=\"weeklydatetext\">$weekday - $endweekday</p>";
     
-                echo format_text($thissection->summary, FORMAT_HTML);
+                $summaryformatoptions->noclean = true;
+                echo format_text($thissection->summary, FORMAT_HTML, $summaryformatoptions);
     
                 if (isediting($course->id)) {
                     echo " <a title=\"$streditsummary\" href=\"editsection.php?id=$thissection->id\">".

diff --git a/course/lib.php b/course/lib.php
index b8c4ac253432156c1d585d870e00fceee218d43d..ec5a089d87344e872cf79bd5cff766998650c506 100644 (file)
--- a/course/lib.php
+++ b/course/lib.php
@@ -882,6 +882,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             $strmovehere = get_string("movehere");
             $strmovefull = strip_tags(get_string("movefull", "", "'$USER->activitycopyname'"));
         }
+        $labelformatoptions->noclean = true;
     }
 
     $modinfo = unserialize($course->modinfo);
@@ -933,7 +934,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
                     if (!$mod->visible) {
                         echo "<span class=\"dimmed_text\">";
                     }
-                    echo format_text($extra, FORMAT_HTML);
+                    echo format_text($extra, FORMAT_HTML, $labelformatoptions);
                     if (!$mod->visible) {
                         echo "</span>";
                     }