Browse Source

Don't strip path from directory prefix

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
tags/v18.0.0beta1
Daniel Kesselberg 5 years ago
parent
commit
75b8944061
No account linked to committer's email address
1 changed files with 6 additions and 1 deletions
  1. 6
    1
      apps/files_external/lib/Lib/Storage/AmazonS3.php

+ 6
- 1
apps/files_external/lib/Lib/Storage/AmazonS3.php View File

@@ -335,7 +335,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
if (is_array($result['CommonPrefixes'])) {
foreach ($result['CommonPrefixes'] as $prefix) {
$files[] = substr(trim($prefix['Prefix'], '/'), strlen($path));
$this->directoryCache[substr(trim($prefix['Prefix'], '/'), strlen($path))] = true;
$this->directoryCache[trim($prefix['Prefix'], '/')] = true;
}
}
if (is_array($result['Contents'])) {
@@ -433,6 +433,11 @@ class AmazonS3 extends \OC\Files\Storage\Common {

public function is_dir($path) {
$path = $this->normalizePath($path);

if (isset($this->filesCache[$path])) {
return false;
}

try {
return $this->isRoot($path) || $this->doesDirectoryExist($path);
} catch (S3Exception $e) {

Loading…
Cancel
Save