summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-07-12 12:14:51 +0200
committerGitHub <noreply@github.com>2017-07-12 12:14:51 +0200
commit08d3cb9107ef800112cc131dfd41b0dd6c43f1f7 (patch)
tree2f018b0196ad7fbe0e4af452a441d83f650aa412 /apps
parent13295c2d1ddf3e4daf491a6c41303dbd1dc40b68 (diff)
parentdfe662ad4222ea6eed2bce4b18aaa4e343fd4af1 (diff)
downloadnextcloud-server-08d3cb9107ef800112cc131dfd41b0dd6c43f1f7.tar.gz
nextcloud-server-08d3cb9107ef800112cc131dfd41b0dd6c43f1f7.zip
Merge pull request #5685 from nextcloud/jail-propagator
Fix propagating changes within jail wrapper
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/SharedPropagator.php44
-rw-r--r--apps/files_sharing/lib/SharedStorage.php12
2 files changed, 0 insertions, 56 deletions
diff --git a/apps/files_sharing/lib/SharedPropagator.php b/apps/files_sharing/lib/SharedPropagator.php
deleted file mode 100644
index f35a5b1d22b..00000000000
--- a/apps/files_sharing/lib/SharedPropagator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
- *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
- *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-
-namespace OCA\Files_Sharing;
-
-use OC\Files\Cache\Propagator;
-
-class SharedPropagator extends Propagator {
- /**
- * @var \OCA\Files_Sharing\SharedStorage
- */
- protected $storage;
-
- /**
- * @param string $internalPath
- * @param int $time
- * @param int $sizeDifference
- */
- public function propagateChange($internalPath, $time, $sizeDifference = 0) {
- /** @var \OC\Files\Storage\Storage $storage */
- list($storage, $sourceInternalPath) = $this->storage->resolvePath($internalPath);
- $storage->getPropagator()->propagateChange($sourceInternalPath, $time, $sizeDifference);
- }
-}
diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index df613bf86bb..32304afea01 100644
--- a/apps/files_sharing/lib/SharedStorage.php
+++ b/apps/files_sharing/lib/SharedStorage.php
@@ -376,18 +376,6 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
return new \OCA\Files_Sharing\Scanner($storage);
}
- public function getPropagator($storage = null) {
- if (isset($this->propagator)) {
- return $this->propagator;
- }
-
- if (!$storage) {
- $storage = $this;
- }
- $this->propagator = new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection());
- return $this->propagator;
- }
-
public function getOwner($path) {
return $this->superShare->getShareOwner();
}