aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2025-05-19 17:16:39 +0200
committerGitHub <noreply@github.com>2025-05-19 17:16:39 +0200
commit9637fe6474d77fbd367dbc69d9fcd5218dbf0e6f (patch)
treef69998e169c92a58ccd202a20531fc86be56e241
parent5ba9bc2dd6eb96e5825214212da43454038cf035 (diff)
downloadnextcloud-server-9637fe6474d77fbd367dbc69d9fcd5218dbf0e6f.tar.gz
nextcloud-server-9637fe6474d77fbd367dbc69d9fcd5218dbf0e6f.zip
Revert "fix(files_sharing): Filter own shares that are reshares"revert-52503-fix/files_sharing/filter-own-reshared-shares
-rw-r--r--apps/files_sharing/lib/MountProvider.php2
-rw-r--r--build/integration/files_features/transfer-ownership.feature9
2 files changed, 10 insertions, 1 deletions
diff --git a/apps/files_sharing/lib/MountProvider.php b/apps/files_sharing/lib/MountProvider.php
index 24d14630303..91c392de6eb 100644
--- a/apps/files_sharing/lib/MountProvider.php
+++ b/apps/files_sharing/lib/MountProvider.php
@@ -55,7 +55,7 @@ class MountProvider implements IMountProvider {
// filter out excluded shares and group shares that includes self
$shares = array_filter($shares, function (IShare $share) use ($user) {
- return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID() && $share->getSharedBy() !== $user->getUID();
+ return $share->getPermissions() > 0 && $share->getShareOwner() !== $user->getUID();
});
$superShares = $this->buildSuperShares($shares, $user);
diff --git a/build/integration/files_features/transfer-ownership.feature b/build/integration/files_features/transfer-ownership.feature
index b7da75421f0..4e5407cadbb 100644
--- a/build/integration/files_features/transfer-ownership.feature
+++ b/build/integration/files_features/transfer-ownership.feature
@@ -210,10 +210,19 @@ Feature: transfer-ownership
And user "user1" accepts last share
When transferring ownership from "user0" to "user1"
And the command was successful
+ And As an "user1"
+ Then Downloaded content when downloading file "/test/somefile.txt" with range "bytes=0-6" should be "This is"
And using old dav path
And as "user0" the folder "/test" exists
And using received transfer folder of "user1" as dav path
And as "user1" the folder "/test" does not exist
+ And As an "user1"
+ And Getting info of last share
+ And the OCS status code should be "100"
+ And Share fields of last share match with
+ | uid_owner | user1 |
+ | uid_file_owner | user3 |
+ | share_with | group1 |
Scenario: transferring ownership of folder reshared with group to a user not in the group
Given user "user0" exists