[Pkg-owncloud-commits] [owncloud] 113/121: use S3Client::encodeKey(), fixes #8325

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit a3c6d20ccb7e554edcb949babac4381e17651ffa
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Thu Aug 14 17:23:19 2014 +0200

    use S3Client::encodeKey(), fixes #8325
---
 apps/files_external/lib/amazons3.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 10fc626..cfc9b51 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, '/');
@@ -441,7 +442,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) {
@@ -457,7 +458,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) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git