MDL-11582 switch category item only if it is really there

diff --git a/grade/lib.php b/grade/lib.php
index 8c090716348fe3cbb83ae49d564e8429aad40c99..9a5ad49dc8e7f088506cd4733a68b29f88006663 100644 (file)
--- a/grade/lib.php
+++ b/grade/lib.php
@@ -941,10 +941,13 @@ class grade_tree {
         if (count($element['children']) < 2) {
             return;
         }
-        $category_item = reset($element['children']);
-        $order = key($element['children']);
-        unset($element['children'][$order]);
-        $element['children'][$order] =& $category_item;
+        $first_item = reset($element['children']);
+        if ($first_item['type'] == 'categoryitem') {
+            // the category item might have been already removed
+            $order = key($element['children']);
+            unset($element['children'][$order]);
+            $element['children'][$order] =& $first_item;
+        }
         foreach ($element['children'] as $sortorder => $child) {
             grade_tree::category_grade_last($element['children'][$sortorder]);
         }