Merge branch 'MDL-56688-master' of https://github.com/nwp90/moodle

2018-02-12 09:32:38 +01:00
parent f40d707dbf 28437460d2
commit 755310cbeb
1 changed files with 6 additions and 1 deletions
@@ -2127,7 +2127,12 @@ class grade_seq extends grade_structure {
        }
        unset($element['children']);

-        if ($category_grade_last and count($children) > 1) {
+        if ($category_grade_last and count($children) > 1 and
+            (
+                $children[0]['type'] === 'courseitem' or
+                $children[0]['type'] === 'categoryitem'
+            )
+        ) {
            $cat_item = array_shift($children);
            array_push($children, $cat_item);
        }