Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

This commit is contained in:
Dan Poltawski 2013-01-17 10:23:15 +08:00
commit 5919718019
2 changed files with 2 additions and 2 deletions

View file

@ -481,7 +481,7 @@ abstract class question_edit_form extends question_wizard_form {
if (is_array($extraquestionfields) && !empty($question->options)) { if (is_array($extraquestionfields) && !empty($question->options)) {
array_shift($extraquestionfields); array_shift($extraquestionfields);
foreach ($extraquestionfields as $field) { foreach ($extraquestionfields as $field) {
if (property_exists($question->options->$field)) { if (property_exists($question->options, $field)) {
$question->$field = $question->options->$field; $question->$field = $question->options->$field;
} }
} }

View file

@ -454,7 +454,7 @@ class question_type {
$options->$questionidcolname = $question->id; $options->$questionidcolname = $question->id;
} }
foreach ($extraquestionfields as $field) { foreach ($extraquestionfields as $field) {
if (property_exists($question->$field)) { if (property_exists($question, $field)) {
$options->$field = $question->$field; $options->$field = $question->$field;
} }
} }