summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-02-08 22:05:13 +0100
committerBart Visscher <bartv@thisnet.nl>2013-02-08 22:05:13 +0100
commited1dc3e064e4ca64fc2db2cecbd1f6bd48242b7b (patch)
tree5ed75fe36d184851fe7a835b6a6a5c071293a1df /apps
parent12bdc6ddb6021f772e8e6364eee89f1406ee3d7d (diff)
downloadnextcloud-server-ed1dc3e064e4ca64fc2db2cecbd1f6bd48242b7b.tar.gz
nextcloud-server-ed1dc3e064e4ca64fc2db2cecbd1f6bd48242b7b.zip
Fix files router download links
Diffstat (limited to 'apps')
-rw-r--r--apps/files/index.php2
-rw-r--r--apps/files/js/filelist.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index 104cf1a55d3..434e98c6ea8 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -92,7 +92,7 @@ foreach (explode('/', $dir) as $i) {
$list = new OCP\Template('files', 'part.list', '');
$list->assign('files', $files, false);
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
-$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
+$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')), false);
$list->assign('disableSharing', false);
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 72b353b48c2..c176057c86d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -15,7 +15,7 @@ var FileList={
extension=false;
}
html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
- html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+escapeHTML(name)+'"><span class="nametext">'+escapeHTML(basename);
+ html+='<a class="name" href="' +OC.Router.generate('download', { file: $('#dir').val()+'/'+name }) +'"><span class="nametext">'+escapeHTML(basename);
if(extension){
html+='<span class="extension">'+escapeHTML(extension)+'</span>';
}