Merge branch 'MDL-37374_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
authorDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)
committerDan Poltawski <dan@moodle.com>
Thu, 17 Jan 2013 02:23:15 +0000 (10:23 +0800)
question/type/edit_question_form.php
question/type/questiontypebase.php

index f0d903e..a90f33e 100644 (file)
@@ -481,7 +481,7 @@ abstract class question_edit_form extends question_wizard_form {
         if (is_array($extraquestionfields) && !empty($question->options)) {
             array_shift($extraquestionfields);
             foreach ($extraquestionfields as $field) {
-                if (property_exists($question->options->$field)) {
+                if (property_exists($question->options$field)) {
                     $question->$field = $question->options->$field;
                 }
             }
index f3620fa..e387e02 100644 (file)
@@ -454,7 +454,7 @@ class question_type {
                 $options->$questionidcolname = $question->id;
             }
             foreach ($extraquestionfields as $field) {
-                if (property_exists($question->$field)) {
+                if (property_exists($question$field)) {
                     $options->$field = $question->$field;
                 }
             }