MDL-18778 more robust reset form defaults

diff --git a/course/reset_form.php b/course/reset_form.php
index 42e0e411ff4c50083e6f4a7aa468b54ca9d1fc55..8acebf9f93dd02e7d2e88be3a24d22e08a998d56 100644 (file)
--- a/course/reset_form.php
+++ b/course/reset_form.php
@@ -111,7 +111,9 @@ class course_reset_form extends moodleform {
                 if (file_exists($modfile)) {
                     @include_once($modfile);
                     if (function_exists($mod_reset_course_form_defaults)) {
-                        $defaults = $defaults + $mod_reset_course_form_defaults($COURSE);
+                        if ($moddefs = $mod_reset_course_form_defaults($COURSE)) {
+                            $defaults = $defaults + $moddefs;
+                        }
                     }
                 }
             }