Signed-off-by: Robin Appelman <robin@icewind.nl>tags/v28.0.0beta2
@@ -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); | |||
} | |||