summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorVictor Dubiniuk <victor.dubiniuk@gmail.com>2013-07-04 19:41:42 +0300
committerVictor Dubiniuk <victor.dubiniuk@gmail.com>2013-07-09 17:46:11 +0300
commit257096f1d4f94bba08988aeca41f81865bdb8e23 (patch)
treee8b9d5adf5d8adb6747d27931b952000d9263711 /apps/files_trashbin
parent582631323acb52b8348975d29a871d950c2e6451 (diff)
downloadnextcloud-server-257096f1d4f94bba08988aeca41f81865bdb8e23.tar.gz
nextcloud-server-257096f1d4f94bba08988aeca41f81865bdb8e23.zip
Encode current trashbin directory
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/index.php9
1 files changed, 6 insertions, 3 deletions
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index a32b7414ac6..6f1c364737e 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -101,12 +101,15 @@ $breadcrumbNav->assign('home', OCP\Util::linkTo('files', 'index.php'));
$list = new OCP\Template('files_trashbin', 'part.list', '');
$list->assign('files', $files);
-$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$dir);
-$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$dir);
+
+$encodedDir = \OCP\Util::encodePath($dir);
+$list->assign('baseURL', OCP\Util::linkTo('files_trashbin', 'index.php'). '?dir='.$encodedDir);
+$list->assign('downloadURL', OCP\Util::linkTo('files_trashbin', 'download.php') . '?file='.$encodedDir);
$list->assign('disableSharing', true);
$list->assign('dirlisting', $dirlisting);
-$tmpl->assign('dirlisting', $dirlisting);
$list->assign('disableDownloadActions', true);
+
+$tmpl->assign('dirlisting', $dirlisting);
$tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage());
$tmpl->assign('fileList', $list->fetchPage());
$tmpl->assign('files', $files);