From: skodak <skodak>
Date: Sun, 5 Apr 2009 19:32:33 +0000 (+0000)
Subject: MDL-18778 more robust reset form defaults
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=97481934ca7f86048dfce2a06e32f9c636fb8820;p=moodle.git

MDL-18778 more robust reset form defaults
---

diff --git a/course/reset_form.php b/course/reset_form.php
index 42e0e411ff..8acebf9f93 100644
--- 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;
+                        }
                     }
                 }
             }