From 80cf4e84e32f09838e9f9e362568f02642ef7658 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 30 Oct 2015 14:37:19 +0100
Subject: Fix file action download spinner

---
 apps/files/js/fileactions.js | 2 +-
 apps/files/js/files.js       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'apps/files/js')

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 079c5330ec2..6a767d48a28 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -589,7 +589,7 @@
 							context.fileList.showFileBusyState(filename, false);
 						};
 
-						context.fileList.showFileBusyState(downloadFileaction, true);
+						context.fileList.showFileBusyState(filename, true);
 						OCA.Files.Files.handleDownload(url, disableLoadingState);
 					}
 				}
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 9ab7609cc40..ae38511ec05 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -295,7 +295,12 @@
 					}
 				};
 
-			OC.redirect(url + '&downloadStartSecret=' + randomToken);
+			if (url.indexOf('?') >= 0) {
+				url += '&';
+			} else {
+				url += '?';
+			}
+			OC.redirect(url + 'downloadStartSecret=' + randomToken);
 			OC.Util.waitFor(checkForDownloadCookie, 500);
 		}
 	};
-- 
cgit v1.2.3