shorten_text() AFTER format properly. See bug 4355.

(http://moodle.org/bugs/bug.php?op=show&bugid=4355)

Merged from MOODLE_15_STABLE
This commit is contained in:
stronk7 2005-11-21 15:42:19 +00:00
parent ce32fe3aa7
commit 91121c8904

View File

@ -166,7 +166,7 @@
}
$introoptions->para=false;
$forum->intro = format_text(shorten_text(trim($forum->intro), $CFG->forum_shortpost), FORMAT_HTML, $introoptions);
$forum->intro = shorten_text(trim(format_text($forum->intro, FORMAT_HTML, $introoptions)), $CFG->forum_shortpost);
if ($forum->visible) {
$forumlink = "<a href=\"view.php?f=$forum->id\">".format_string($forum->name,true)."</a>";
@ -306,7 +306,7 @@
}
$introoptions->para=false;
$forum->intro = format_text(shorten_text(trim($forum->intro), $CFG->forum_shortpost), FORMAT_HTML, $introoptions);
$forum->intro = shorten_text(trim(format_text($forum->intro, FORMAT_HTML, $introoptions)), $CFG->forum_shortpost);
if ($forum->section != $currentsection) {
$printsection = $forum->section;