1 files changed, 11 insertions, 6 deletions
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f5ee363a4c8..c30f1bcddd8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -147,15 +147,19 @@ $(document).ready(function () {
 	} else {
 		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());
-	});
-
+	
+	if (typeof disableDownloadActions == 'undefined' || !disableDownloadActions) {
+		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());
+		});
+	}
+	
 	$('#fileList tr').each(function(){
 		FileActions.display($(this).children('td.filename'));
 	});
+	
 });
 
 FileActions.register('all', 'Delete', OC.PERMISSION_DELETE, function () {
@@ -185,6 +189,7 @@ FileActions.register('all', 'Rename', OC.PERMISSION_UPDATE, function () {
 	FileList.rename(filename);
 });
 
+
 FileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename) {
 	window.location = OC.linkTo('files', 'index.php') + '?dir=' + encodeURIComponent($('#dir').val()).replace(/%2F/g, '/') + '/' + encodeURIComponent(filename);
 });