diff options
author | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-10 23:20:27 +0100 |
---|---|---|
committer | Robin McCorkell <rmccorkell@owncloud.com> | 2015-08-19 14:41:43 +0100 |
commit | 3b27603762e38f87d50b923e05cfb86c83b1ca1b (patch) | |
tree | 11b6fbe81ccd314667bc334db6727a23e558a70b /lib/private | |
parent | 118cb7df1a906ce003fd80c1d64b357f45afcf02 (diff) | |
download | nextcloud-server-3b27603762e38f87d50b923e05cfb86c83b1ca1b.tar.gz nextcloud-server-3b27603762e38f87d50b923e05cfb86c83b1ca1b.zip |
Revert "Fix mounting wrapped storages resulting in many-layered wrapping"
This reverts commit 75a5e6e12b18a9f5b7b113cd7e2c9c56c204084d.
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/files/mount/mountpoint.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/files/mount/mountpoint.php index 5e4949aa9dd..2871bbd9083 100644 --- a/lib/private/files/mount/mountpoint.php +++ b/lib/private/files/mount/mountpoint.php @@ -29,7 +29,6 @@ namespace OC\Files\Mount; use \OC\Files\Filesystem; use OC\Files\Storage\StorageFactory; use OC\Files\Storage\Storage; -use OC\Files\Storage\Wrapper\Wrapper; use OCP\Files\Mount\IMountPoint; class MountPoint implements IMountPoint { @@ -93,11 +92,7 @@ class MountPoint implements IMountPoint { $this->mountPoint = $mountpoint; if ($storage instanceof Storage) { $this->class = get_class($storage); - $this->storage = $storage; - // only wrap if not already wrapped - if (!($this->storage instanceof Wrapper)) { - $this->storage = $this->loader->wrap($this, $this->storage); - } + $this->storage = $this->loader->wrap($this, $storage); } else { // Update old classes to new namespace if (strpos($storage, 'OC_Filestorage_') !== false) { |