Merge branch 'MDL-45029-26' of git://github.com/lameze/moodle into MOODLE_26_STABLE

Conflicts:
	course/modlib.php
This commit is contained in:
Damyon Wiese 2014-08-20 13:59:45 +08:00
commit 24d7efcec3

View file

@ -285,7 +285,7 @@ function edit_module_post_actions($moduleinfo, $course) {
$outcome_item->set_parent($moduleinfo->gradecat); $outcome_item->set_parent($moduleinfo->gradecat);
} }
$gradecategory = $outcome_item->get_parent_category(); $gradecategory = $outcome_item->get_parent_category();
if (!empty($moduleinfo->add)) { if ($outcomeexists == false) {
if (grade_category::aggregation_uses_aggregationcoef($gradecategory->aggregation)) { if (grade_category::aggregation_uses_aggregationcoef($gradecategory->aggregation)) {
if ($gradecategory->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) { if ($gradecategory->aggregation == GRADE_AGGREGATE_WEIGHTED_MEAN) {
$outcome_item->aggregationcoef = 1; $outcome_item->aggregationcoef = 1;