diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-10-28 14:10:10 +0100 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2012-10-28 14:10:10 +0100 |
| commit | cf2a504d42d35a200cb611b11c8cfa394895fca9 (patch) | |
| tree | 192816e2cc4c93f2655d8033b4481d9ad0207d3f /core/js/js.js | |
| parent | fc280b28876bd1b57a8f4a5710da26adb8ebb3b9 (diff) | |
| parent | 20e0432de8e635b742415cae58e1466daf7da9b5 (diff) | |
| download | nextcloud-server-cf2a504d42d35a200cb611b11c8cfa394895fca9.tar.gz nextcloud-server-cf2a504d42d35a200cb611b11c8cfa394895fca9.zip | |
Merge branch 'master' into navigation
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/core/js/js.js b/core/js/js.js index c5e32f3c278..6ed50b42bd5 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -62,7 +62,7 @@ function escapeHTML(s) { * @return string */ function fileDownloadPath(dir, file) { - return OC.filePath('files', 'ajax', 'download.php')+'&files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir); + return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir); } var OC={ @@ -95,9 +95,9 @@ var OC={ var isCore=OC.coreApps.indexOf(app)!==-1, link=OC.webroot; if((file.substring(file.length-3) === 'php' || file.substring(file.length-3) === 'css') && !isCore){ - link+='/?app=' + app; + link+='/index.php/apps/' + app; if (file != 'index.php') { - link+='&getfile='; + link+='/'; if(type){ link+=encodeURI(type + '/'); } @@ -113,7 +113,12 @@ var OC={ } link+=file; }else{ - link+='/'; + if ((app == 'settings' || app == 'core') && type == 'ajax') { + link+='/index.php/'; + } + else { + link+='/'; + } if(!isCore){ link+='apps/'; } |