1
0
mirror of https://github.com/moodle/moodle.git synced 2025-03-28 19:42:56 +01:00

Merge branch 'MDL-74201-master' of https://github.com/aanabit/moodle

This commit is contained in:
Sara Arjona 2022-11-09 11:49:28 +01:00
commit 89d7a73c2c

@ -5485,7 +5485,8 @@ class restore_process_file_aliases_queue extends restore_execution_step {
continue;
}
if ($info->oldfile->repositorytype === 'local' or $info->oldfile->repositorytype === 'coursefiles') {
if ($info->oldfile->repositorytype === 'local' || $info->oldfile->repositorytype === 'coursefiles'
|| $info->oldfile->repositorytype === 'contentbank') {
// Aliases to Server files and Legacy course files may refer to a file
// contained in the backup file or to some existing file (if we are on the
// same site).
@ -5648,7 +5649,8 @@ class restore_process_file_aliases_queue extends restore_execution_step {
// Both Server files and Legacy course files repositories have a single
// instance at the system context to use. Let us try to find it.
if ($info->oldfile->repositorytype === 'local' or $info->oldfile->repositorytype === 'coursefiles') {
if ($info->oldfile->repositorytype === 'local' || $info->oldfile->repositorytype === 'coursefiles'
|| $info->oldfile->repositorytype === 'contentbank') {
$sql = "SELECT ri.id
FROM {repository} r
JOIN {repository_instances} ri ON ri.typeid = r.id