diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-27 11:58:02 +0200 |
| commit | 0120f3fd629e772d9a7493e5289c1d6708ba92d5 (patch) | |
| tree | dbee6eba6d11afe887a6235375119b7a6bd71b69 /core/js/js.js | |
| parent | 74665faec533430be37879bfc0ef24aa7f211f6e (diff) | |
| parent | beaaf5425dc2dfb7456efa934fa8eb91ac28c677 (diff) | |
| download | nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.tar.gz nextcloud-server-0120f3fd629e772d9a7493e5289c1d6708ba92d5.zip | |
Merge branch 'routing'
Conflicts:
core/lostpassword/index.php
core/lostpassword/resetpassword.php
Diffstat (limited to 'core/js/js.js')
| -rw-r--r-- | core/js/js.js | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/core/js/js.js b/core/js/js.js index c5e32f3c278..130d413296e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -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/'; } |