Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2019-03-22 03:26:16 +0300
committerGitHub <noreply@github.com>2019-03-22 03:26:16 +0300
commit085741a795b1f5bb6dfe3ffb2b393c20d953c199 (patch)
treec1cf02abae436dfce6efe0bab3eedf6a2552fda2
parent2e30a5d10705fae41b7b74e68cedcfbf85412bd7 (diff)
parent7cab488c6f68586dc55d02eaf16c381ddf416bce (diff)
Merge pull request #14795 from nextcloud/backport/14058/stable15
[stable15] Avoid replacement by user object
-rw-r--r--lib/private/Files/Mount/ObjectHomeMountProvider.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php
index 62669020884..009aadf30a9 100644
--- a/lib/private/Files/Mount/ObjectHomeMountProvider.php
+++ b/lib/private/Files/Mount/ObjectHomeMountProvider.php
@@ -110,7 +110,6 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
if (!isset($config['arguments'])) {
$config['arguments'] = [];
}
- $config['arguments']['user'] = $user;
$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);
@@ -134,6 +133,8 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
// instantiate object store implementation
$config['arguments']['objectstore'] = new $config['class']($config['arguments']);
+ $config['arguments']['user'] = $user;
+
return $config;
}
}