From 55268700529fac358fa98617c828f4958f0645ed Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Fri, 13 Mar 2020 23:30:33 +0000 Subject: [PATCH] MDL-67731 backup: fix async restores in progress table listing. --- backup/util/helper/async_helper.class.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/backup/util/helper/async_helper.class.php b/backup/util/helper/async_helper.class.php index b36e51542399f..309c478b0c5aa 100644 --- a/backup/util/helper/async_helper.class.php +++ b/backup/util/helper/async_helper.class.php @@ -305,10 +305,17 @@ public static function get_async_backups($renderer, $instanceid) { $tabledata = array(); // Get relevant backup ids based on context instance id. - $select = 'itemid = ? AND execution = ? AND status < ? AND status > ?'; - $params = array($instanceid, backup::EXECUTION_DELAYED, backup::STATUS_FINISHED_ERR, backup::STATUS_NEED_PRECHECK); - $backups = $DB->get_records_select('backup_controllers', $select, $params, 'timecreated DESC', 'id, backupid, timecreated'); + $select = 'itemid = :itemid AND execution = :execution AND status < :status1 AND status > :status2 ' . + 'AND operation = :operation'; + $params = [ + 'itemid' => $instanceid, + 'execution' => backup::EXECUTION_DELAYED, + 'status1' => backup::STATUS_FINISHED_ERR, + 'status2' => backup::STATUS_NEED_PRECHECK, + 'operation' => 'backup', + ]; + $backups = $DB->get_records_select('backup_controllers', $select, $params, 'timecreated DESC', 'id, backupid, timecreated'); foreach ($backups as $backup) { $bc = \backup_controller::load_controller($backup->backupid); // Get the backup controller. $filename = $bc->get_plan()->get_setting('filename')->get_value();