Merge branch 'master_MDL-66225_async_backup_state' of https://github.com/mattporritt/moodle

backup/backup.php

@@ -123,6 +123,9 @@ if (!async_helper::is_async_pending($id, 'course', 'backup')) {
     if (!($bc = backup_ui::load_controller($backupid))) {
         $bc = new backup_controller($type, $id, backup::FORMAT_MOODLE,
                 backup::INTERACTIVE_YES, $backupmode, $USER->id);
+        // The backup id did not relate to a valid controller so we made a new controller.
+        // Now we need to reset the backup id to match the new controller.
+        $backupid = $bc->get_backupid();
     }
 
     // Prepare a progress bar which can display optionally during long-running