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

Merge branch 'MDL-64465' of https://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7) 2019-01-22 23:59:38 +01:00
commit b48f694a69
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
question/type/calculated/edit_calculated_form.php
View File

@ -136,7 +136,7 @@ class qtype_calculated_edit_form extends qtype_numerical_edit_form {
if (isset($this->question->id)) {
$mform->insertElementBefore($mform->createElement('static', 'initialname',
get_string('questionstoredname', 'qtype_calculated'),
format_string($this->initialname, true, array('context' => $this->context))), 'name');
format_string($this->initialname)), 'name');
};
$addfieldsname = 'updatecategory';
$addstring = get_string('updatecategory', 'qtype_calculated');

2
question/type/calculatedmulti/edit_calculatedmulti_form.php
View File

@ -126,7 +126,7 @@ class qtype_calculatedmulti_edit_form extends question_edit_form {
if (isset($this->question->id)) {
$mform->insertElementBefore($mform->createElement('static', 'initialname',
get_string('questionstoredname', 'qtype_calculated'),
format_string($this->initialname, true, array('context' => $this->context))), 'name');
format_string($this->initialname)), 'name');
};
$addfieldsname = 'updatecategory';
$addstring = get_string('updatecategory', 'qtype_calculated');

3
question/type/match/renderer.php
View File

@ -124,8 +124,7 @@ class qtype_match_renderer extends qtype_with_combined_feedback_renderer {
protected function format_choices($question) {
$choices = array();
foreach ($question->get_choice_order() as $key => $choiceid) {
$choices[$key] = format_string($question->choices[$choiceid], true,
array('context' => $question->contextid));
$choices[$key] = format_string($question->choices[$choiceid]);
}
return $choices;
}