Skip to content

Commit

Permalink
Merge pull request #14795 from nextcloud/backport/14058/stable15
Browse files Browse the repository at this point in the history
[stable15] Avoid replacement by user object
  • Loading branch information
MorrisJobke authored Mar 22, 2019
2 parents 2e30a5d + 7cab488 commit 085741a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion lib/private/Files/Mount/ObjectHomeMountProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ private function getMultiBucketObjectStoreConfig(IUser $user) {
if (!isset($config['arguments'])) {
$config['arguments'] = [];
}
$config['arguments']['user'] = $user;

$bucket = $this->config->getUserValue($user->getUID(), 'homeobjectstore', 'bucket', null);

Expand All @@ -134,6 +133,8 @@ private function getMultiBucketObjectStoreConfig(IUser $user) {
// instantiate object store implementation
$config['arguments']['objectstore'] = new $config['class']($config['arguments']);

$config['arguments']['user'] = $user;

return $config;
}
}

0 comments on commit 085741a

Please sign in to comment.