diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2018-09-29 21:10:40 +0200 |
|---|---|---|
| committer | Backportbot <backportbot-noreply@rullzer.com> | 2019-09-26 09:41:45 +0000 |
| commit | c0649bed360d6ec316e81baa1c81dacbba2a8d4e (patch) | |
| tree | e01c788ecd4e57497251aed0422456fec2f93694 /apps/files_external | |
| parent | 22c937bdf19151d1a43e94390744bdcc6f931920 (diff) | |
| download | nextcloud-server-c0649bed360d6ec316e81baa1c81dacbba2a8d4e.tar.gz nextcloud-server-c0649bed360d6ec316e81baa1c81dacbba2a8d4e.zip | |
Rename $location to $path
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/AmazonS3.php | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/files_external/lib/Lib/Storage/AmazonS3.php b/apps/files_external/lib/Lib/Storage/AmazonS3.php index 403dddc9106..c935d500200 100644 --- a/apps/files_external/lib/Lib/Storage/AmazonS3.php +++ b/apps/files_external/lib/Lib/Storage/AmazonS3.php @@ -148,30 +148,30 @@ class AmazonS3 extends \OC\Files\Storage\Common { * Implementation from flysystem-aws-s3-v3: * https://github.com/thephpleague/flysystem-aws-s3-v3/blob/8241e9cc5b28f981e0d24cdaf9867f14c7498ae4/src/AwsS3Adapter.php#L670-L694 * - * @param $location + * @param $path * @return bool * @throws \Exception */ - protected function doesDirectoryExist($location) { - if (!isset($this->directoryCache[$location])) { + protected function doesDirectoryExist($path) { + if (!isset($this->directoryCache[$path])) { // Maybe this isn't an actual key, but a prefix. // Do a prefix listing of objects to determine. try { $result = $this->getConnection()->listObjects([ 'Bucket' => $this->bucket, - 'Prefix' => rtrim($location, '/') . '/', + 'Prefix' => rtrim($path, '/') . '/', 'MaxKeys' => 1, ]); - $this->directoryCache[$location] = $result['Contents'] || $result['CommonPrefixes']; + $this->directoryCache[$path] = $result['Contents'] || $result['CommonPrefixes']; } catch (S3Exception $e) { if ($e->getStatusCode() === 403) { - $this->directoryCache[$location] = false; + $this->directoryCache[$path] = false; } throw $e; } } - return $this->directoryCache[$location]; + return $this->directoryCache[$path]; } /** |