mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-15 05:25:08 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-39369' of git://github.com/rwijaya/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2013-06-17 15:10:41 +12:00
commit d63082454b
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mod/lesson/locallib.php
View File

@ -762,14 +762,12 @@ abstract class lesson_add_page_form_base extends moodleform {
if ($label === null) {
$label = get_string("score", "lesson");
}
$elname = $name;
if (is_int($name)) {
$name = "score[$name]";
$elname = 'score';
}
$this->_form->addElement('text', $name, $label, array('size'=>5));
// Temporary fix until MDL-38885 gets integrated.
$this->_form->setType($elname, PARAM_INT);
$this->_form->setType($name, PARAM_INT);
if ($value !== null) {
$this->_form->setDefault($name, $value);
}

6
mod/lesson/pagetypes/matching.php
View File

@ -477,8 +477,7 @@ class lesson_add_page_form_matching extends lesson_add_page_form_base {
$label = get_string('matchesanswer','lesson');
$count = $i;
$this->_form->addElement('text', 'response_editor['.$count.']', $label, array('size'=>'50'));
// Temporary fix until MDL-38885 gets integrated.
$this->_form->setType('response_editor', PARAM_TEXT);
$this->_form->setType('response_editor['.$count.']', PARAM_NOTAGS);
$this->_form->setDefault('response_editor['.$count.']', '');
if ($required) {
$this->_form->addRule('response_editor['.$count.']', get_string('required'), 'required', null, 'client');
@ -527,8 +526,7 @@ class lesson_display_answer_form_matching extends moodleform {
if ($hasattempt) {
$responseid = 'response_'.$answer->id;
$mform->addElement('hidden', 'response['.$answer->id.']', htmlspecialchars(trim($answers[$useranswers[$i]]->response)));
// Temporary fixed until MDL-38885 gets integrated
$mform->setType('response', PARAM_TEXT);
$mform->setType('response', PARAM_NOTAGS);
}
$mform->addElement('select', $responseid, format_text($answer->answer,$answer->answerformat,$options), $responseoptions, $disabled);
$mform->setType($responseid, PARAM_TEXT);

3
mod/lesson/pagetypes/multichoice.php
View File

@ -553,8 +553,7 @@ class lesson_display_answer_form_multichoice_multianswer extends moodleform {
if ($hasattempt && in_array($answer->id, $useranswers)) {
$answerid = 'answer_'.$answer->id;
$mform->addElement('hidden', 'answer['.$answer->id.']', $answer->answer);
// Temporary fix until MDL-38885 gets integrated.
$mform->setType('answer', PARAM_TEXT);
$mform->setType('answer['.$answer->id.']', PARAM_NOTAGS);
$mform->setDefault($answerid, true);
$mform->setDefault('answer['.$answer->id.']', true);
}