mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 22:50:19 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-64240-master' of git://github.com/mickhawkins/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-01-24 00:56:42 +01:00
commit caa0383ae5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mod/forum/lib.php
View File

@ -3617,7 +3617,7 @@ function forum_print_post($post, $discussion, $forum, &$cm, $course, $ownpost=fa
$postcontent = highlight($highlight, $postcontent);
}
if (!empty($forum->displaywordcount)) {
$postcontent .= html_writer::tag('div', get_string('numwords', 'moodle', count_words($post->message)),
$postcontent .= html_writer::tag('div', get_string('numwords', 'moodle', count_words($postcontent)),
array('class'=>'post-word-count'));
}
$postcontent .= html_writer::tag('div', $attachedimages, array('class'=>'attachedimages'));

3
mod/forum/post.php
View File

@ -696,6 +696,9 @@ if ($mformpost->is_cancelled()) {
// WARNING: the $fromform->message array has been overwritten, do not use it anymore!
$fromform->messagetrust = trusttext_trusted($modcontext);
// Clean message text.
$fromform = trusttext_pre_edit($fromform, 'message', $modcontext);
if ($fromform->edit) { // Updating a post.
unset($fromform->groupid);
$fromform->id = $fromform->edit;