Skip to content

[stable29] fix: Handle missing share providers when promoting reshares #52041

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
merged 2 commits into from
Apr 14, 2025
Merged

[stable29] fix: Handle missing share providers when promoting reshares #52041

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
483305c
fix: Handle missing share providers when promoting reshares
danxuliu Apr 8, 2025
fa9edf3
test: adjust broken tests
susnux Apr 14, 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
7 changes: 6 additions & 1 deletion lib/private/Share20/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,12 @@ protected function promoteReshares(IShare $share): void {

foreach ($userIds as $userId) {
foreach ($shareTypes as $shareType) {
$provider = $this->factory->getProviderForType($shareType);
try {
$provider = $this->factory->getProviderForType($shareType);
} catch (ProviderException $e) {
continue;
}

if ($node instanceof Folder) {
/* We need to get all shares by this user to get subshares */
$shares = $provider->getSharesBy($userId, $shareType, null, false, -1, 0);
Expand Down
2 changes: 1 addition & 1 deletion tests/lib/Share20/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ public function testLinkCreateChecksReadOnly() {

public function testPathCreateChecksContainsSharedMount() {
$this->expectException(\InvalidArgumentException::class);
$this->expectExceptionMessage('You cannot share a folder that contains other shares');
$this->expectExceptionMessage('Path contains files shared with you');

$path = $this->createMock(Folder::class);
$path->method('getPath')->willReturn('path');
Expand Down
Loading