Merge branch 'MDL-75616-master' of https://github.com/davewoloszyn/moodle

admin/cli/restore_backup.php

@@ -92,8 +92,8 @@ if ($options['categoryid']) {
     throw new \moodle_exception('invalidoption');
 }
 
-$backupdir = "restore_" . uniqid();
-$path = $CFG->tempdir . DIRECTORY_SEPARATOR . "backup" . DIRECTORY_SEPARATOR . $backupdir;
+$backupdir = restore_controller::get_tempdir_name(SITEID, $USER->id);
+$path = make_backup_temp_directory($backupdir);
 
 cli_heading(get_string('extractingbackupfileto', 'backup', $path));
 $fp = get_file_packer('application/vnd.moodle.backup');