And some more (the last) notices out! Bug 5713.

(http://moodle.org/bugs/bug.php?op=show&bugid=5713)

backup/restore_execute.html

@@ -48,8 +48,7 @@
         error ("An error has occurred and the restore could not be completed!");
     }
 
-    if (!$restore->importing) {
-        echo $output;
+    if (empty($restore->importing)) {
         //Print final message
         print_simple_box(get_string("restorefinished"),"center");
     } else {

backup/restorelib.php

@@ -5209,6 +5209,7 @@
                 if (!defined('RESTORE_SILENTLY')) {
                     echo '<li>'.get_string('creatingblocks').'</li>';
                 }
+                $course_header->blockinfo = !empty($course_header->blockinfo) ? $course_header->blockinfo : NULL;
                 if (!$status = restore_create_blocks($restore, $info->backup_block_format, $course_header->blockinfo, $xml_file)) {
                     if (!defined('RESTORE_SILENTLY')) {
                         notify('Error while creating the course blocks');