Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-01-10 10:35:40 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-01-10 10:35:40 +0300
commitd4f163b2300b5190366f38b51d4e7a80fde6d235 (patch)
tree483eb7674ef2ea0f0971dc20285432ac3424b288 /apps/files/js/file-upload.js
parente5cc8ebe7a14ab421a83be2b664a9bb976c0d063 (diff)
Don't encode paths passed to the OC.Files.Client
This is handled already in the client. So double encoding breaks things in some situations. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r--apps/files/js/file-upload.js14
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 8e95abcb5e8..ad56492730e 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -235,7 +235,7 @@ OC.FileUpload.prototype = {
) {
data.isChunked = true;
chunkFolderPromise = this.uploader.davClient.createDirectory(
- 'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
+ 'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
);
// TODO: if fails, it means same id already existed, need to retry
} else {
@@ -272,8 +272,8 @@ OC.FileUpload.prototype = {
}
return this.uploader.davClient.move(
- 'uploads/' + encodeURIComponent(uid) + '/' + encodeURIComponent(this.getId()) + '/.file',
- 'files/' + encodeURIComponent(uid) + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
+ 'uploads/' + uid + '/' + this.getId() + '/.file',
+ 'files/' + uid + '/' + OC.joinPaths(this.getFullPath(), this.getFileName()),
true,
headers
);
@@ -282,7 +282,7 @@ OC.FileUpload.prototype = {
_deleteChunkFolder: function() {
// delete transfer directory for this upload
this.uploader.davClient.remove(
- 'uploads/' + encodeURIComponent(OC.getCurrentUser().uid) + '/' + encodeURIComponent(this.getId())
+ 'uploads/' + OC.getCurrentUser().uid + '/' + this.getId()
);
},
@@ -1166,9 +1166,9 @@ OC.Uploader.prototype = _.extend({
var chunkId = range.split('/')[0].split('-')[0];
data.url = OC.getRootPath() +
'/remote.php/dav/uploads' +
- '/' + encodeURIComponent(OC.getCurrentUser().uid) +
- '/' + encodeURIComponent(upload.getId()) +
- '/' + encodeURIComponent(chunkId);
+ '/' + OC.getCurrentUser().uid +
+ '/' + upload.getId() +
+ '/' + chunkId;
delete data.contentRange;
delete data.headers['Content-Range'];
});