Browse Source
optimize cache jail creation
Signed-off-by: Robin Appelman <robin@icewind.nl>
pull/40995/head
Robin Appelman
3 years ago
No known key found for this signature in database
GPG Key ID: 42B69D8A64526EFB
2 changed files with
1 additions and
6 deletions
-
lib/private/Files/Cache/Wrapper/CacheJail.php
-
lib/private/Files/Storage/Wrapper/Jail.php
|
|
|
@ -52,8 +52,6 @@ class CacheJail extends CacheWrapper { |
|
|
|
public function __construct($cache, $root) { |
|
|
|
parent::__construct($cache); |
|
|
|
$this->root = $root; |
|
|
|
$this->connection = \OC::$server->getDatabaseConnection(); |
|
|
|
$this->mimetypeLoader = \OC::$server->getMimeTypeLoader(); |
|
|
|
|
|
|
|
if ($cache instanceof CacheJail) { |
|
|
|
$this->unjailedRoot = $cache->getSourcePath($root); |
|
|
|
|
|
|
|
@ -396,10 +396,7 @@ class Jail extends Wrapper { |
|
|
|
* @return \OC\Files\Cache\Cache |
|
|
|
*/ |
|
|
|
public function getCache($path = '', $storage = null) { |
|
|
|
if (!$storage) { |
|
|
|
$storage = $this->getWrapperStorage(); |
|
|
|
} |
|
|
|
$sourceCache = $this->getWrapperStorage()->getCache($this->getUnjailedPath($path), $storage); |
|
|
|
$sourceCache = $this->getWrapperStorage()->getCache($this->getUnjailedPath($path)); |
|
|
|
return new CacheJail($sourceCache, $this->rootPath); |
|
|
|
} |
|
|
|
|
|
|
|
|
