summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-09-28 22:19:37 +0200
committerBart Visscher <bartv@thisnet.nl>2012-09-28 22:20:17 +0200
commitdbdf3bde7ccf721cfc1efa4d13262bd6f444de73 (patch)
tree34ab13505a5a5bb83570e0c113817977d95c5c5d /lib
parentc9317b5a68baac268e8b24a462065a5e9e3164e7 (diff)
downloadnextcloud-server-dbdf3bde7ccf721cfc1efa4d13262bd6f444de73.tar.gz
nextcloud-server-dbdf3bde7ccf721cfc1efa4d13262bd6f444de73.zip
Implement route for download in OC_Search_Provider_File
Diffstat (limited to 'lib')
-rw-r--r--lib/route.php5
-rw-r--r--lib/search/provider/file.php3
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/route.php b/lib/route.php
index 772446e5615..ba9d1724d12 100644
--- a/lib/route.php
+++ b/lib/route.php
@@ -64,4 +64,9 @@ class OC_Route extends Route {
$this->setDefault('action', $action);
return $this;
}
+
+ public function actionInclude($file) {
+ $function = create_function('$param', 'unset($param["_route"]);$_GET=$param;unset($param);require_once "'.$file.'";');
+ $this->action($function);
+ }
}
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 21fae0c1ce5..e4e976ed7fd 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -10,12 +10,11 @@ class OC_Search_Provider_File extends OC_Search_Provider{
$name = basename($path);
$text = '';
- $path = urlencode($path);
if($mime=='httpd/unix-directory') {
$link = OC_Helper::linkTo( 'files', 'index.php', array('dir' => $path));
$type = 'Files';
}else{
- $link = OC_Helper::linkTo( 'files', 'download.php', array('file' => $path));
+ $link = OC_Helper::linkToRoute( 'download', array('file' => $path));
$mimeBase = $fileData['mimepart'];
switch($mimeBase) {
case 'audio':