Skip to content

[stable15] Avoid replacement by user object #14795

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Mar 22, 2019
Merged

[stable15] Avoid replacement by user object #14795

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Store user object later in the code 
Signed-off-by: Vlastimil Pecinka <[email protected]>
  • Loading branch information
@vpecinka
vpecinka authored and Backportbot committed Mar 21, 2019
commit 7cab488c6f68586dc55d02eaf16c381ddf416bce
3 changes: 2 additions & 1 deletion lib/private/Files/Mount/ObjectHomeMountProvider.php
View file
Open in desktop
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;
}
}