diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2010-11-28 22:54:59 +0000 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2010-11-28 22:54:59 +0000 |
| commit | 962e548495d76dbef2c6dd26805894eff5e39cdc (patch) | |
| tree | 447e905b8e2eaf71efa7e6afdb67371478437b78 /js | |
| parent | 4b0c953e663c5539630d5ac14b7a1d3ab4220dfb (diff) | |
| parent | e18898dfe140b091840107aa47ac4ece7a68edd6 (diff) | |
| download | nextcloud-server-962e548495d76dbef2c6dd26805894eff5e39cdc.tar.gz nextcloud-server-962e548495d76dbef2c6dd26805894eff5e39cdc.zip | |
Merge branch 'master' of git://gitorious.org/owncloud/owncloud
Diffstat (limited to 'js')
| -rw-r--r-- | js/filebrowser.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/filebrowser.js b/js/filebrowser.js index 1ad37ebcf3f..a12a7cd715c 100644 --- a/js/filebrowser.js +++ b/js/filebrowser.js @@ -310,7 +310,7 @@ OC_FILES.browser.show_callback=function(content){ OC_FILES.browser.files.show(null,content); } if(OC_FILES.uploadForm){ - OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+dir); + OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+encodeURIComponent(dir)); } } @@ -423,7 +423,7 @@ OC_FILES.browser.showuploader=function(dir,parent,max_upload){ var iframeId=OC_FILES.uploadIFrames.length OC_FILES.uploadForm=document.createElement('form'); OC_FILES.uploadForm.setAttribute('target','uploadIFrame'+iframeId); - OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+dir); + OC_FILES.uploadForm.setAttribute('action','files/upload.php?dir='+encodeURIComponent(dir)); OC_FILES.uploadForm.method='post'; OC_FILES.uploadForm.setAttribute('enctype','multipart/form-data'); OC_FILES.uploadIFrames[iframeId]=document.createElement('iframe'); |