diff options
author | Morris Jobke <hey@morrisjobke.de> | 2015-08-25 08:43:01 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2015-08-25 08:43:01 +0200 |
commit | 424759908d044866c8d686e9f321df1d1e609fa9 (patch) | |
tree | de1b72e0806ad660491e95e9aad279638853b6a0 /apps/files_external/service/storagesservice.php | |
parent | 09808a9007511c2d06da31daed7a9e2061646401 (diff) | |
parent | 643e3a5b6db19b9ba0210fef89f6ee163bc0edef (diff) | |
download | nextcloud-server-424759908d044866c8d686e9f321df1d1e609fa9.tar.gz nextcloud-server-424759908d044866c8d686e9f321df1d1e609fa9.zip |
Merge pull request #18445 from owncloud/ext-only-setuservars-string
setUserVars() should only attempt substitution with strings
Diffstat (limited to 'apps/files_external/service/storagesservice.php')
-rw-r--r-- | apps/files_external/service/storagesservice.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/files_external/service/storagesservice.php b/apps/files_external/service/storagesservice.php index 282ac8f2db1..3e2152741e5 100644 --- a/apps/files_external/service/storagesservice.php +++ b/apps/files_external/service/storagesservice.php @@ -118,6 +118,8 @@ abstract class StoragesService { $applicableGroups[] = $applicable; $storageConfig->setApplicableGroups($applicableGroups); } + + return $storageConfig; } @@ -238,6 +240,12 @@ abstract class StoragesService { $this->setRealStorageIds($storages, $storagesWithConfigHash); } + // convert parameter values + foreach ($storages as $storage) { + $storage->getBackend()->validateStorageDefinition($storage); + $storage->getAuthMechanism()->validateStorageDefinition($storage); + } + return $storages; } |