wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't strip path from directory prefix

Browse source 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
This commit is contained in:
Daniel Kesselberg 2019-02-14 18:06:09 +01:00 committed by Backportbot
parent 812402f3ac
commit bb16bd8e73
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
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'])) { if (is_array($result['CommonPrefixes'])) {
foreach ($result['CommonPrefixes'] as $prefix) { foreach ($result['CommonPrefixes'] as $prefix) {
$files[] = substr(trim($prefix['Prefix'], '/'), strlen($path)); $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'])) { if (is_array($result['Contents'])) {
@ -433,6 +433,11 @@ class AmazonS3 extends \OC\Files\Storage\Common {
public function is_dir($path) { public function is_dir($path) {
$path = $this->normalizePath($path); $path = $this->normalizePath($path);
if (isset($this->filesCache[$path])) {
return false;
}
try { try {
return $this->isRoot($path) || $this->doesDirectoryExist($path); return $this->isRoot($path) || $this->doesDirectoryExist($path);
} catch (S3Exception $e) { } catch (S3Exception $e) {