Merge branch 'MDL-33125_22' of git://github.com/aolley/moodle into MOODLE_22_STABLE

2012-12-10 10:19:13 +13:00
parent c274d5eef9 5227c9c305
commit 6b02b455a4
1 changed files with 9 additions and 0 deletions
@@ -189,6 +189,15 @@ class restore_gradebook_structure_step extends restore_structure_step {
                $data->id = $newitemid = $existinggradeitem->id;
                $DB->update_record('grade_items', $data);
            }
+        } else if ($data->itemtype == 'manual') {
+            // Manual items aren't assigned to a cm, so don't go duplicating them in the target if one exists.
+            $gi = array(
+                'itemtype' => $data->itemtype,
+                'courseid' => $data->courseid,
+                'itemname' => $data->itemname,
+                'categoryid' => $data->categoryid,
+            );
+            $newitemid = $DB->get_field('grade_items', 'id', $gi);
        }

        if (empty($newitemid)) {