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

Merge branch 'MDL-32114-401' of https://github.com/srobotta/moodle into MOODLE_401_STABLE

Browse Source
This commit is contained in:
Paul Holden 2023-01-06 11:20:47 +00:00
commit b99d68087d
5 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/weblib.php
View File

@ -1325,9 +1325,8 @@ function format_text($text, $format = FORMAT_MOODLE, $options = null, $courseidd
case FORMAT_MARKDOWN:
$text = markdown_to_html($text);
if (!$options['noclean']) {
$text = clean_text($text, FORMAT_HTML, $options);
}
// The markdown parser does not strip dangerous html so we need to clean it, even if noclean is set to true.
$text = clean_text($text, FORMAT_HTML, $options);
$text = $filtermanager->filter_text($text, $context, $filteroptions);
break;

12
mod/forum/post.php
View File

@ -343,7 +343,10 @@ if (!empty($forum)) {
$canreplyprivately = forum_user_can_reply_privately($modcontext, $parent);
}
$post = trusttext_pre_edit($post, 'message', $modcontext);
// If markdown is used, the parser does the job already, otherwise clean text from arbitrary code that might be dangerous.
if ($post->messageformat != FORMAT_MARKDOWN) {
$post = trusttext_pre_edit($post, 'message', $modcontext);
}
// Unsetting this will allow the correct return URL to be calculated later.
unset($SESSION->fromdiscussion);
@ -796,9 +799,10 @@ 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);
// Clean message text, unless markdown which should be saved as it is, otherwise editing messes things up.
if ($fromform->messageformat != FORMAT_MARKDOWN) {
$fromform = trusttext_pre_edit($fromform, 'message', $modcontext);
}
if ($fromform->edit) {
// Updating a post.
unset($fromform->groupid);

7
theme/boost/scss/moodle/core.scss
View File

@ -3023,3 +3023,10 @@ body.dragging {
}
}
}
blockquote {
margin: 0 0.5rem 1rem;
padding-left: 1rem;
color: $gray-700;
border-left: 5px solid $gray-400;
}

6
theme/boost/style/moodle.css
View File

@ -12321,6 +12321,12 @@ body.dragging .dragging {
border-top-right-radius: 0.2rem;
border-bottom-right-radius: 0.2rem; }
blockquote {
margin: 0 0.5rem 1rem;
padding-left: 1rem;
color: #495057;
border-left: 5px solid #ced4da; }
.icon {
font-size: 16px;
width: 16px;

6
theme/classic/style/moodle.css
View File

@ -12321,6 +12321,12 @@ body.dragging .dragging {
border-top-right-radius: 0.2rem;
border-bottom-right-radius: 0.2rem; }
blockquote {
margin: 0 0.5rem 1rem;
padding-left: 1rem;
color: #495057;
border-left: 5px solid #ced4da; }
.icon {
font-size: 16px;
width: 16px;