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

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

Merged from MOODLE_16_STABLE

diff --git a/backup/restore_execute.html b/backup/restore_execute.html
index d5893fc28fe86a9c97d607b88119bdc993535035..ab14271c2f798a643f9235c3b37e9d40d18aa1a0 100644 (file)
--- a/backup/restore_execute.html
+++ b/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 {

diff --git a/backup/restorelib.php b/backup/restorelib.php
index 8d889efaa70c5b6cee47039f2304a41245658cea..9384518e0d03f779c276d858767b5e33eae8f99e 100644 (file)
--- a/backup/restorelib.php
+++ b/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');