Merge branch 'MDL-48061-master-fixes' of https://github.com/andrewnicols/moodle

This commit is contained in:
Damyon Wiese 2014-11-06 11:30:42 +08:00
commit ce1b8779df

View File

@ -1192,7 +1192,7 @@ function forum_make_mail_text($course, $cm, $forum, $discussion, $post, $userfro
if (!$bare) {
$shortname = format_string($course->shortname, true, array('context' => context_course::instance($course->id)));
$posttext = "$shortname -> $strforums -> ".format_string($forum->name,true);
$posttext .= "$shortname -> $strforums -> ".format_string($forum->name,true);
if ($discussion->name != $forum->name) {
$posttext .= " -> ".format_string($discussion->name,true);