MDL-13231 outcomes aggregation off by default now; merged from MOODLE_19_STABLE

diff --git a/admin/settings/grades.php b/admin/settings/grades.php
index 427bcaaad4d7c6a71cd95647a0ff4c4984ba2c58..aeac2007d63fa542cc0cffeb69c28afcda3e875e 100644 (file)
--- a/admin/settings/grades.php
+++ b/admin/settings/grades.php
@@ -73,9 +73,9 @@ if (has_capability('moodle/grade:manage', $systemcontext)
         $defaults = array('value'=>1, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregateonlygraded', get_string('aggregateonlygraded', 'grades'),
                     get_string('aggregateonlygradedhelp', 'grades'), $defaults, $options));
+        $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregateoutcomes', get_string('aggregateoutcomes', 'grades'),
                     get_string('aggregateoutcomeshelp', 'grades'), $defaults, $options));
-        $defaults = array('value'=>0, 'forced'=>false, 'adv'=>true);
         $temp->add(new admin_setting_gradecat_combo('grade_aggregatesubcats', get_string('aggregatesubcats', 'grades'),
                     get_string('aggregatesubcatshelp', 'grades'), $defaults, $options));