Permalink
Browse files

Merged fixes for over-keen cleaning from STABLE

  • Loading branch information...
1 parent 98cb29d commit 179c9a500f81a2f5135c6f075908e89107889f30 moodler committed Sep 3, 2004
Showing with 10 additions and 5 deletions.
  1. +4 −2 course/format/topics/format.php
  2. +4 −2 course/format/weeks/format.php
  3. +2 −1 course/lib.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>".
@@ -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\">".
View
@@ -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>";
}

0 comments on commit 179c9a5

Please sign in to comment.