mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into filesystem

This commit is contained in:
Robin Appelman 2012-10-27 15:31:27 +02:00
parent 38371d1275 939b51e46f
commit 8973124574
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/files/js/fileactions.js
View File

@ -157,7 +157,7 @@ $(document).ready(function(){
var downloadScope = 'file'; var downloadScope = 'file';
} }
FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download');},function(filename){ 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());
}); });
}); });

2
core/js/js.js
View File

@ -62,7 +62,7 @@ function escapeHTML(s) {
* @return string * @return string
*/ */
function fileDownloadPath(dir, file) { 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={ var OC={