Skipping empty categories in restore. They shouldn't exist but

I've received some examples of this these days.

Merged from MOODLE_14_STABLE

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 2b6288764955ebefe26281b162a8f01dfa243961..d0e3f324e8025250cc79e41539c5455334768209 100644 (file)
--- a/backup/restorelib.php
+++ b/backup/restorelib.php
@@ -990,13 +990,16 @@
             if ($info !== true) {
                 //Iterate over each category
                 foreach ($info as $category) {
-                    $catrestore = "quiz_restore_question_categories";
-                    if (function_exists($catrestore)) {
-                        //print_object ($category);                                                //Debug
-                        $status = $catrestore($category,$restore);
-                    } else {
-                        //Something was wrong. Function should exist.
-                        $status = false;
+                    //Skip empty categories (some backups can contain them)
+                    if (!empty($category->id)) {
+                        $catrestore = "quiz_restore_question_categories";
+                        if (function_exists($catrestore)) {
+                            //print_object ($category);                                                //Debug
+                            $status = $catrestore($category,$restore);
+                        } else {
+                            //Something was wrong. Function should exist.
+                            $status = false;
+                        }
                     }
                 }
             }