Prevent some warning when restoring site courses... MDL-10054 MDL-10118

Merged from MOODLE_18_STABLE

diff --git a/backup/restore_form.html b/backup/restore_form.html
index 6a3a715625fe3f8cfe80101dc4c74bf14a0656e1..b3e679883566ae683798575aaa0deb19bf89f3a4 100644 (file)
--- a/backup/restore_form.html
+++ b/backup/restore_form.html
@@ -103,6 +103,10 @@
         }
     }
 
+    if (!isset($course_header->category->id)) {
+        $course_header->category->id = 0;
+    }
+
     if(!isset($form1->startdate)) {
         $form1->startdate = $course_header->course_startdate; //$course_header->course_startdate;
     }