diff --git a/backup/moodle2/backup_stepslib.php b/backup/moodle2/backup_stepslib.php index 7439b27a71d..46862a700d7 100644 --- a/backup/moodle2/backup_stepslib.php +++ b/backup/moodle2/backup_stepslib.php @@ -39,6 +39,7 @@ class create_and_clean_temp_stuff extends backup_execution_step { backup_helper::check_and_create_backup_dir($this->get_backupid());// Create backup temp dir backup_helper::clear_backup_dir($this->get_backupid(), $progress); // Empty temp dir, just in case backup_helper::delete_old_backup_dirs(time() - (4 * 60 * 60), $progress); // Delete > 4 hours temp dirs + backup_controller_dbops::drop_backup_ids_temp_table($this->get_backupid()); // Drop ids temp table backup_controller_dbops::create_backup_ids_temp_table($this->get_backupid()); // Create ids temp table $progress->end_progress(); } diff --git a/backup/util/dbops/backup_controller_dbops.class.php b/backup/util/dbops/backup_controller_dbops.class.php index cb4577c80dc..6d066b48408 100644 --- a/backup/util/dbops/backup_controller_dbops.class.php +++ b/backup/util/dbops/backup_controller_dbops.class.php @@ -160,8 +160,10 @@ abstract class backup_controller_dbops extends backup_dbops { $dbman = $DB->get_manager(); // We are going to use database_manager services $targettablename = 'backup_ids_temp'; - $table = new xmldb_table($targettablename); - $dbman->drop_table($table); // And drop it + if ($dbman->table_exists($targettablename)) { + $table = new xmldb_table($targettablename); + $dbman->drop_table($table); // And drop it + } } /**