Merge branch 'MDL-30880_feedback_property_21' of git://github.com/and…

…yjdavis/moodle into MOODLE_21_STABLE
moodle · Jun 5, 2012 · 296d5c0 · 296d5c0
2 parents 044c0ce + 043af1f
commit 296d5c0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/grade/edit/tree/grade.php b/grade/edit/tree/grade.php
@@ -163,7 +163,7 @@
 // form processing
 } else if ($data = $mform->get_data(false)) {
 
-    if (is_array($data->feedback)) {
+    if (isset($data->feedback) && is_array($data->feedback)) {
         $data->feedbackformat = $data->feedback['format'];
         $data->feedback = $data->feedback['text'];
     }