Merge pull request #20641 from owncloud/files_external_missing_backend
dont die if the external storage backend doesn't exist
This commit is contained in:
commit
f3ff858323
|
@ -221,17 +221,26 @@ abstract class StoragesService {
|
||||||
$currentStorage->setMountPoint($relativeMountPath);
|
$currentStorage->setMountPoint($relativeMountPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->populateStorageConfigWithLegacyOptions(
|
try {
|
||||||
$currentStorage,
|
$this->populateStorageConfigWithLegacyOptions(
|
||||||
$mountType,
|
$currentStorage,
|
||||||
$applicable,
|
$mountType,
|
||||||
$storageOptions
|
$applicable,
|
||||||
);
|
$storageOptions
|
||||||
|
);
|
||||||
|
|
||||||
if ($hasId) {
|
if ($hasId) {
|
||||||
$storages[$configId] = $currentStorage;
|
$storages[$configId] = $currentStorage;
|
||||||
} else {
|
} else {
|
||||||
$storagesWithConfigHash[$configId] = $currentStorage;
|
$storagesWithConfigHash[$configId] = $currentStorage;
|
||||||
|
}
|
||||||
|
} catch (\UnexpectedValueException $e) {
|
||||||
|
// dont die if a storage backend doesn't exist
|
||||||
|
\OCP\Util::writeLog(
|
||||||
|
'files_external',
|
||||||
|
'Could not load storage: "' . $e->getMessage() . '"',
|
||||||
|
\OCP\Util::ERROR
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue