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

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

View File

@ -1287,7 +1287,7 @@ function forum_make_mail_html($course, $cm, $forum, $discussion, $post, $userfro
$posthtml .= "\n<body id=\"email\">\n\n";
if ($replyaddress) {
$posttext .= "<p><em>--" . get_string('deleteoriginalonreply', 'mod_forum') . "--</em></p>";
$posthtml .= "<p><em>--" . get_string('deleteoriginalonreply', 'mod_forum') . "--</em></p>";
}
$posthtml .= '<div class="navbar">'.