diff options
| author | Robin Appelman <robin@icewind.nl> | 2020-04-29 16:34:41 +0200 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2020-04-30 15:27:09 +0200 |
| commit | 4e6d3d18805ba7713a65c461b627f8474d82f4f5 (patch) | |
| tree | b209e7440b267d32e67325058062f66e9080758b /lib | |
| parent | 8d5404b750df85a947c43aacc266c6088d8b4aed (diff) | |
| download | nextcloud-server-4e6d3d18805ba7713a65c461b627f8474d82f4f5.tar.gz nextcloud-server-4e6d3d18805ba7713a65c461b627f8474d82f4f5.zip | |
Fix getDirectoryContent implementation for Jail wrapper
Signed-off-by: Robin Appelman <robin@icewind.nl>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/ObjectStore/SwiftFactory.php | 4 | ||||
| -rw-r--r-- | lib/private/Files/Storage/Wrapper/Jail.php | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/private/Files/ObjectStore/SwiftFactory.php b/lib/private/Files/ObjectStore/SwiftFactory.php index 9857e1def85..0354fba638f 100644 --- a/lib/private/Files/ObjectStore/SwiftFactory.php +++ b/lib/private/Files/ObjectStore/SwiftFactory.php @@ -78,12 +78,12 @@ class SwiftFactory { * @throws StorageAuthException */ public function getCachedTokenId() { - if ( !isset($this->params['cachedToken']) ) { + if (!isset($this->params['cachedToken'])) { throw new StorageAuthException('Unauthenticated ObjectStore connection'); } // Is it V2 token? - if ( isset($this->params['cachedToken']['token']) ) { + if (isset($this->params['cachedToken']['token'])) { return $this->params['cachedToken']['token']['id']; } diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php index 929a4942562..7350c104ba8 100644 --- a/lib/private/Files/Storage/Wrapper/Jail.php +++ b/lib/private/Files/Storage/Wrapper/Jail.php @@ -541,6 +541,6 @@ class Jail extends Wrapper { } public function getDirectoryContent($directory): \Traversable { - return $this->getWrapperStorage()->getDirectoryContent($this->getJailedPath($directory)); + return $this->getWrapperStorage()->getDirectoryContent($this->getUnjailedPath($directory)); } } |