mirror of
https://github.com/moodle/moodle.git
synced 2025-03-14 04:30:15 +01:00
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:
parent
ce32fe3aa7
commit
91121c8904
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user