Merge pull request #18928 from owncloud/stable8.1-backport-18832

[stable8.1] Avoid re-propagation of shares during one propagation run

1 files changed, 8 insertions, 0 deletions

diff --git a/apps/files_sharing/lib/propagation/recipientpropagator.php b/apps/files_sharing/lib/propagation/recipientpropagator.php
index 11764106861..420cacb3d2f 100644
--- a/apps/files_sharing/lib/propagation/recipientpropagator.php
+++ b/apps/files_sharing/lib/propagation/recipientpropagator.php
@@ -126,7 +126,13 @@ class RecipientPropagator {
 		});
 	}
 
+	protected $propagatingIds = [];
+
 	public function propagateById($id) {
+		if (isset($this->propagatingIds[$id])) {
+			return;
+		}
+		$this->propagatingIds[$id] = true;
 		$shares = Share::getAllSharesForFileId($id);
 		foreach ($shares as $share) {
 			// propagate down the share tree
@@ -141,5 +147,7 @@ class RecipientPropagator {
 				$watcher->writeHook(['path' => $path]);
 			}
 		}
+
+		unset($this->propagatingIds[$id]);
 	}
 }