Skip to content
Permalink
Browse files

Merge branch 'MDL-34993' of git://github.com/timhunt/moodle

  • Loading branch information...
stronk7 committed Aug 27, 2012
2 parents 1edce59 + d2acbd1 commit d683fcdf98c077cbaf3f906c15ab83c6a240315f
Showing with 9 additions and 1 deletion.
  1. +8 −0 lib/questionlib.php
  2. +1 −1 question/type/edit_question_form.php
@@ -785,14 +785,22 @@ function question_load_questions($questionids, $extrafields = '', $join = '') {
*/
function _tidy_question($question, $loadtags = false) {
global $CFG;
// Load question-type specific fields.
if (!question_bank::is_qtype_installed($question->qtype)) {
$question->questiontext = html_writer::tag('p', get_string('warningmissingtype',
'qtype_missingtype')) . $question->questiontext;
}
question_bank::get_qtype($question->qtype)->get_question_options($question);
// Convert numeric fields to float. (Prevents these being displayed as 1.0000000.)
$question->defaultmark += 0;
$question->penalty += 0;
if (isset($question->_partiallyloaded)) {
unset($question->_partiallyloaded);
}
if ($loadtags && !empty($CFG->usetags)) {
require_once($CFG->dirroot . '/tag/lib.php');
$question->tags = tag_get_tags_array('question', $question->id);
@@ -190,7 +190,7 @@ protected function definition() {
$mform->setType('questiontext', PARAM_RAW);
$mform->addElement('text', 'defaultmark', get_string('defaultmark', 'question'),
array('size' => 3));
array('size' => 7));
$mform->setType('defaultmark', PARAM_FLOAT);
$mform->setDefault('defaultmark', 1);
$mform->addRule('defaultmark', null, 'required', null, 'client');

0 comments on commit d683fcd

Please sign in to comment.
You can’t perform that action at this time.