L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-55366-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Dan Poltawski
2016-08-15 11:44:09 +01:00
parent e4346dad32 bd576de814
commit 338fd5dd57
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mod/lesson/pagetypes/matching.php
+1 -3
View File
@@ -572,9 +572,7 @@ class lesson_display_answer_form_matching extends moodleform {
// Temporary fixed until MDL-38885 gets integrated
$mform->setType('response', PARAM_TEXT);
}
$context = context_module::instance($PAGE->cm->id);
$answer->answer = file_rewrite_pluginfile_urls($answer->answer, 'pluginfile.php', $context->id,
'mod_lesson', 'page_answers', $answer->id);
$answer = lesson_page_type_matching::rewrite_answers_urls($answer);
$mform->addElement('select', $responseid, format_text($answer->answer,$answer->answerformat,$options), $responseoptions, $disabled);
$mform->setType($responseid, PARAM_TEXT);
if ($hasattempt) {
mod/lesson/pagetypes/truefalse.php
+1
View File
@@ -416,6 +416,7 @@ class lesson_display_answer_form_truefalse extends moodleform {
$ansid = 'answer_id';
}
$answer = lesson_page_type_truefalse::rewrite_answers_urls($answer);
$radiobuttons[] = $mform->createElement('radio', $ansid, null,
format_text($answer->answer, $answer->answerformat, $options), $answer->id, $disabled);