diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-28 10:14:59 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-28 10:14:59 +0100 |
| commit | 5a99310cdf31f6c82871f775f2a8c5abe924e2e8 (patch) | |
| tree | 0aa1485c03001c5c64b107eca584e1e892e051c1 /files/js | |
| parent | 16c8f626586f55f4020e788693cee72f7f6d6f55 (diff) | |
| parent | 16e4e6dcc30959f733dad3b75dda3153ffcfa73f (diff) | |
| download | nextcloud-server-5a99310cdf31f6c82871f775f2a8c5abe924e2e8.tar.gz nextcloud-server-5a99310cdf31f6c82871f775f2a8c5abe924e2e8.zip | |
Merge git://gitorious.org/owncloud/owncloud into contact_thumbnails
Fixed some conflicts.
Conflicts:
apps/contacts/css/styles.css
apps/contacts/templates/index.php
Diffstat (limited to 'files/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'); |