Skip to content

[stable31] fix: more optimized caching for share target verification #52071

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

Open
backportbot wants to merge 2 commits into
base: stable31
Choose a base branch
from
Open

[stable31] fix: more optimized caching for share target verification #52071

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d125e81
fix: more optimized caching for share target verification
icewind1991 Apr 8, 2025
51b52d8
fix: don't return other mounts from share mount provider
icewind1991 Apr 11, 2025
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
Prev Previous commit
fix: don't return other mounts from share mount provider 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991
icewind1991 committed Apr 11, 2025
commit 51b52d824803a9f60ce22c839273b4a1d24eec0b
7 changes: 4 additions & 3 deletions apps/files_sharing/lib/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {

$superShares = $this->buildSuperShares($shares, $user);

$mounts = $this->mountManager->getAll();
$otherMounts = $this->mountManager->getAll();
$mounts = [];
$view = new View('/' . $user->getUID() . '/files');
$ownerViews = [];
$sharingDisabledForUser = $this->shareManager->sharingDisabledForUser($user->getUID());
Expand Down Expand Up @@ -90,7 +91,7 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
$shareId = (int)$parentShare->getId();
$mount = new SharedMount(
'\OCA\Files_Sharing\SharedStorage',
$mounts,
array_merge($mounts, $otherMounts),
[
'user' => $user->getUID(),
// parent share
Expand All @@ -105,7 +106,7 @@ public function getMountsForUser(IUser $user, IStorageFactory $loader) {
$foldersExistCache,
$this->eventDispatcher,
$user,
($shareId <= $maxValidatedShare)
($shareId <= $maxValidatedShare),
);

$newMaxValidatedShare = max($shareId, $newMaxValidatedShare);
Expand Down
Loading