Merge branch 'MDL-59453-master' of git://github.com/jleyva/moodle

This commit is contained in:
David Monllao 2017-07-25 11:53:00 +02:00
commit 10f9517c22

View File

@ -993,8 +993,10 @@ class mod_lesson_external extends external_api {
if ($returncontents || $canmanage || (lesson_displayleftif($lesson) && $page->displayinmenublock && $page->display)) {
$pagedata->title = external_format_string($page->title, $context->id);
$options = array('noclean' => true);
list($pagedata->contents, $pagedata->contentsformat) =
external_format_text($page->contents, $page->contentsformat, $context->id, 'mod_lesson', 'page_contents', $page->id);
external_format_text($page->contents, $page->contentsformat, $context->id, 'mod_lesson', 'page_contents', $page->id,
$options);
}
return $pagedata;
@ -1309,10 +1311,13 @@ class mod_lesson_external extends external_api {
$answer[$prop] = $a->{$prop};
}
$options = array('noclean' => true);
list($answer['answer'], $answer['answerformat']) =
external_format_text($a->answer, $a->answerformat, $context->id, 'mod_lesson', 'page_answers', $a->id);
external_format_text($a->answer, $a->answerformat, $context->id, 'mod_lesson', 'page_answers', $a->id,
$options);
list($answer['response'], $answer['responseformat']) =
external_format_text($a->response, $a->responseformat, $context->id, 'mod_lesson', 'page_responses', $a->id);
external_format_text($a->response, $a->responseformat, $context->id, 'mod_lesson', 'page_responses',
$a->id, $options);
}
$answers[] = $answer;
}