diff options
| author | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-25 23:01:45 +0200 |
|---|---|---|
| committer | Thomas Müller <DeepDiver1975@users.noreply.github.com> | 2016-04-25 23:01:45 +0200 |
| commit | f6e1b43a38823b53b3fb80ec78fe6faddb367312 (patch) | |
| tree | 84ce88cdcd402ae56122c3b3758455a3a516a9ac /apps | |
| parent | 9c6ba6b123d28078ae914dd0a8add55361141aba (diff) | |
| parent | dbfdc6282af2c00deece8196684b7c67a1064bb4 (diff) | |
| download | nextcloud-server-f6e1b43a38823b53b3fb80ec78fe6faddb367312.tar.gz nextcloud-server-f6e1b43a38823b53b3fb80ec78fe6faddb367312.zip | |
Merge pull request #22648 from owncloud/propagate-single
do propagation in a single query
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files_sharing/lib/sharedpropagator.php | 1 | ||||
| -rw-r--r-- | apps/files_sharing/lib/sharedstorage.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/files_sharing/lib/sharedpropagator.php b/apps/files_sharing/lib/sharedpropagator.php index 8de90b9552b..f17cfc3a75b 100644 --- a/apps/files_sharing/lib/sharedpropagator.php +++ b/apps/files_sharing/lib/sharedpropagator.php @@ -33,7 +33,6 @@ class SharedPropagator extends Propagator { * @param string $internalPath * @param int $time * @param int $sizeDifference - * @return \array[] all propagated entries */ public function propagateChange($internalPath, $time, $sizeDifference = 0) { /** @var \OC\Files\Storage\Storage $storage */ diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php index 48ab3fad5f6..1a040364f11 100644 --- a/apps/files_sharing/lib/sharedstorage.php +++ b/apps/files_sharing/lib/sharedstorage.php @@ -332,7 +332,7 @@ class Shared extends \OC\Files\Storage\Wrapper\Jail implements ISharedStorage { if (!$storage) { $storage = $this; } - return new \OCA\Files_Sharing\SharedPropagator($storage); + return new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection()); } public function getOwner($path) { |