diff options
Diffstat (limited to 'apps/files_external')
| -rw-r--r-- | apps/files_external/lib/amazons3.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php index 3b0ae5bbe0d..60d2677ddda 100644 --- a/apps/files_external/lib/amazons3.php +++ b/apps/files_external/lib/amazons3.php @@ -56,6 +56,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { /** * @param string $path + * @return string correctly encoded path */ private function normalizePath($path) { $path = trim($path, '/'); @@ -436,7 +437,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { $result = $this->connection->copyObject(array( 'Bucket' => $this->bucket, 'Key' => $this->cleanKey($path2), - 'CopySource' => $this->bucket . '/' . $path1 + 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1) )); $this->testTimeout(); } catch (S3Exception $e) { @@ -452,7 +453,7 @@ class AmazonS3 extends \OC\Files\Storage\Common { $result = $this->connection->copyObject(array( 'Bucket' => $this->bucket, 'Key' => $path2 . '/', - 'CopySource' => $this->bucket . '/' . $path1 . '/' + 'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/') )); $this->testTimeout(); } catch (S3Exception $e) { |