summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2020-01-08 09:11:27 +0100
committerGitHub <noreply@github.com>2020-01-08 09:11:27 +0100
commit69ae7abe72fd032adbec1c7dc01fca64aea2fbe8 (patch)
treef5a1bcd0ace97642d4c090128690a562c3ca2d6f /apps
parentada25ab461e3ec728357fac0e96664c39daf1902 (diff)
parentfc54df81d0b57dd743dae200e61805a18ad0abcb (diff)
downloadnextcloud-server-69ae7abe72fd032adbec1c7dc01fca64aea2fbe8.tar.gz
nextcloud-server-69ae7abe72fd032adbec1c7dc01fca64aea2fbe8.zip
Merge pull request #18713 from nextcloud/fix/noid/do-remove-shares-generated-from-circles
remove non-circles-generated federated shares only
Diffstat (limited to 'apps')
-rw-r--r--apps/federatedfilesharing/lib/FederatedShareProvider.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/federatedfilesharing/lib/FederatedShareProvider.php b/apps/federatedfilesharing/lib/FederatedShareProvider.php
index 859dcaf4ed8..82f47d61ded 100644
--- a/apps/federatedfilesharing/lib/FederatedShareProvider.php
+++ b/apps/federatedfilesharing/lib/FederatedShareProvider.php
@@ -599,7 +599,8 @@ class FederatedShareProvider implements IShareProvider {
private function removeShareFromTableById($shareId) {
$qb = $this->dbConnection->getQueryBuilder();
$qb->delete('share')
- ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)));
+ ->where($qb->expr()->eq('id', $qb->createNamedParameter($shareId)))
+ ->where($qb->expr()->neq('share_type', $qb->createNamedParameter(IShare::TYPE_CIRCLE)));
$qb->execute();
$qb->delete('federated_reshares')