From a677165290edd6acaf1e62100b84a22088d329b1 Mon Sep 17 00:00:00 2001 From: skodak Date: Tue, 30 Oct 2007 11:55:49 +0000 Subject: [PATCH] fixing previous merge --- lib/grade/grade_item.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/grade/grade_item.php b/lib/grade/grade_item.php index 7c428e3bc9..163c001605 100644 --- a/lib/grade/grade_item.php +++ b/lib/grade/grade_item.php @@ -7,7 +7,7 @@ // Moodle - Modular Object-Oriented Dynamic Learning Environment // // http://moodle.com // // // -// Copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com // +// Copyright (C) 1999 onwards Martin Dougiamas http://dougiamas.com // // // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // @@ -1199,15 +1199,7 @@ class grade_item extends grade_object { return $this->dependson_cache; } - // If global aggregateoutcomes is set, override category value - if ($CFG->grade_aggregateoutcomes != -1) { - $grade_category->aggregateoutcomes = $CFG->grade_aggregateoutcomes; - } - - // If global aggregatesubcats is set, override category value - if ($CFG->grade_aggregatesubcats != -1) { - $grade_category->aggregatesubcats = $CFG->grade_aggregatesubcats; - } + $grade_category->apply_forced_settings(); if (empty($CFG->enableoutcomes) or $grade_category->aggregateoutcomes) { $outcomes_sql = ""; -- 2.39.5