summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2015-11-18 17:54:00 +0100
committerLukas Reschke <lukas@owncloud.com>2015-11-22 16:05:51 +0100
commitec3166742b08eabcca2c6d2166070b4cee488bf7 (patch)
treed6a8a1fb25e8b39373bb7499a67d2721903c11d7 /apps/files_trashbin
parent7ec83fc9fbb7428bde4cf0e1071704c941ac1f37 (diff)
downloadnextcloud-server-ec3166742b08eabcca2c6d2166070b4cee488bf7.tar.gz
nextcloud-server-ec3166742b08eabcca2c6d2166070b4cee488bf7.zip
Properly join path sections
This prevents double slashes that can mess up path comparisons in some cases.
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/js/app.js5
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 1f46f568bf2..600a8ce2b03 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -38,10 +38,7 @@ OCA.Trashbin.App = {
var fileActions = new OCA.Files.FileActions();
fileActions.register('dir', 'Open', OC.PERMISSION_READ, '', function (filename, context) {
var dir = context.fileList.getCurrentDirectory();
- if (dir !== '/') {
- dir = dir + '/';
- }
- context.fileList.changeDirectory(dir + filename);
+ context.fileList.changeDirectory(OC.joinPaths(dir, filename));
});
fileActions.setDefault('dir', 'Open');