Skip to content
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.

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

search files by id in shared storages last #15776

Merged
merged 1 commit into from
May 29, 2019
Merged

Conversation

icewind1991
Copy link
Member

this prevents unneeded recursion when the file is not in the share

Signed-off-by: Robin Appelman robin@icewind.nl

@icewind1991 icewind1991 added the 3. to review Waiting for reviews label May 28, 2019
@icewind1991 icewind1991 added this to the Nextcloud 17 milestone May 28, 2019

// put non shared mounts in front of the shared mount
// this prevent unneeded recursion into shares
$sharedMount = array_filter($mounts, function(IMountPoint $mountPoint) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't u use a custom sort function here? Is this faster? 🤔

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point, changed

this prevents unneeded recursion when the file is not in the share

Signed-off-by: Robin Appelman <robin@icewind.nl>
@icewind1991 icewind1991 force-pushed the get-by-id-shares-last branch from 728bd9d to 98dd526 Compare May 28, 2019 18:04
@icewind1991
Copy link
Member Author

/backport to stable16

@icewind1991
Copy link
Member Author

/backport to stable15

@blizzz
Copy link
Member

blizzz commented May 29, 2019

this seems to fix also possible ServiceUnavailale exceptions when unsharing (in some conditions i could not reproduce though)

@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels May 29, 2019
@rullzer rullzer merged commit 58fe0b8 into master May 29, 2019
@rullzer rullzer deleted the get-by-id-shares-last branch May 29, 2019 19:56
@backportbot-nextcloud
Copy link

backport to stable16 in #15799

@backportbot-nextcloud
Copy link

backport to stable15 in #15800

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants