diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-10 23:04:27 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2012-05-10 23:04:27 -0400 |
| commit | 59a2616105e82d3f17d3eea188ce79fbc107eafa (patch) | |
| tree | a7793eb2117355be2c9c2f7fb98240c467ba8886 | |
| parent | 20d9a8b6a114b4cdc0f7dc524135e8e0c676a00f (diff) | |
| download | nextcloud-server-59a2616105e82d3f17d3eea188ce79fbc107eafa.tar.gz nextcloud-server-59a2616105e82d3f17d3eea188ce79fbc107eafa.zip | |
Fix music file action i.e. click to play, make OC.filePath act like OC_Helper::linkTo() for index.php links
| -rwxr-xr-x | apps/media/templates/player.php | 1 | ||||
| -rw-r--r-- | core/js/js.js | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php index 4d478ec5f50..6c14006f831 100755 --- a/apps/media/templates/player.php +++ b/apps/media/templates/player.php @@ -1,6 +1,5 @@ <?php if(!isset($_)){//allow the template to be loaded standalone - require_once '../../../lib/base.php'; $tmpl = new OCP\Template( 'media', 'player'); $tmpl->printPage(); exit; diff --git a/core/js/js.js b/core/js/js.js index 4b0978cfb52..90f1207780d 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -54,11 +54,14 @@ OC={ var isCore=OC.coreApps.indexOf(app)!=-1; var link=OC.webroot; if((file.substring(file.length-3) == 'php' || file.substring(file.length-3) == 'css') && !isCore){ - link+='/?app=' + app + '&getfile='; - if(type){ - link+=encodeURI(type + '/'); + link+='/?app=' + app; + if (file != 'index.php') { + link+='&getfile='; + if(type){ + link+=encodeURI(type + '/'); + } + link+= file; } - link+= file; }else if(file.substring(file.length-3) != 'php' && !isCore){ link=OC.appswebroot; link+='/'; |