diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 01:18:02 +0000 |
| commit | cbb2db8622dbcff2314204bc548ebdd3005bd0fc (patch) | |
| tree | bbe14faf0201b4131b8ca9c9d4eac59edb7da5e8 /files/js/fileactions.js | |
| parent | e7de25434206a4849a7c7315d4d9926325c7b730 (diff) | |
| parent | eb4cd869107d4afa1c259751e765ca39defb9279 (diff) | |
| download | nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.tar.gz nextcloud-server-cbb2db8622dbcff2314204bc548ebdd3005bd0fc.zip | |
Fix merge conflicts
Diffstat (limited to 'files/js/fileactions.js')
| -rw-r--r-- | files/js/fileactions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/files/js/fileactions.js b/files/js/fileactions.js index 9e2688e82c1..6f0729e43b6 100644 --- a/files/js/fileactions.js +++ b/files/js/fileactions.js @@ -137,7 +137,7 @@ FileActions.register('all','Rename',function(){return OC.imagePath('core','actio }); FileActions.register('dir','Open','',function(filename){ - window.location='index.php?dir='+$('#dir').val()+'/'+filename; + window.location='index.php?dir='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); }); FileActions.setDefault('dir','Open'); |