diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-27 15:31:27 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-27 15:31:27 +0200 |
| commit | 8973124574b0017eee15efa4f7c23cbe1d5fbed9 (patch) | |
| tree | 5d29fd68f5e81d8f5d13fd22949db2e8b4f01242 | |
| parent | 38371d12756a3d64b8381cf034ae0774b5934df1 (diff) | |
| parent | 939b51e46f23fe6f5991a05862da94bb3adff1ab (diff) | |
| download | nextcloud-server-8973124574b0017eee15efa4f7c23cbe1d5fbed9.tar.gz nextcloud-server-8973124574b0017eee15efa4f7c23cbe1d5fbed9.zip | |
Merge branch 'master' into filesystem
| -rw-r--r-- | apps/files/js/fileactions.js | 2 | ||||
| -rw-r--r-- | core/js/js.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js index 0cf4a052225..1cf80352bef 100644 --- a/apps/files/js/fileactions.js +++ b/apps/files/js/fileactions.js @@ -157,7 +157,7 @@ $(document).ready(function(){ var downloadScope = 'file'; } FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){ - window.location=OC.filePath('files', 'ajax', 'download.php') + '&files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()); + window.location=OC.filePath('files', 'ajax', 'download.php') + '?files='+encodeURIComponent(filename)+'&dir='+encodeURIComponent($('#dir').val()); }); }); diff --git a/core/js/js.js b/core/js/js.js index 130d413296e..6ed50b42bd5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -62,7 +62,7 @@ function escapeHTML(s) { * @return string */ function fileDownloadPath(dir, file) { - return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir); + return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir); } var OC={ |