diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-02-25 05:13:38 -0800 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-02-25 05:13:38 -0800 |
| commit | a37577e007ef458e31d3484b5f969ea0e98545f3 (patch) | |
| tree | 138645a5fd437be51cd3566bb9b4ca476850d57e /apps/files_trashbin/index.php | |
| parent | 3f48bebe924062cc01abc8c72019235a00f38b76 (diff) | |
| parent | 7da97550df61e7a82463b91139e8f18923765bc9 (diff) | |
| download | nextcloud-server-a37577e007ef458e31d3484b5f969ea0e98545f3.tar.gz nextcloud-server-a37577e007ef458e31d3484b5f969ea0e98545f3.zip | |
Merge pull request #1810 from owncloud/trashbin_encryption
Trashbin file encryption support
Diffstat (limited to 'apps/files_trashbin/index.php')
| -rw-r--r-- | apps/files_trashbin/index.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index 4615df3586f..2f1fb32f8ce 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -9,7 +9,7 @@ OCP\Util::addScript('files', 'fileactions'); $tmpl = new OCP\Template('files_trashbin', 'index', 'user'); $user = \OCP\User::getUser(); -$view = new OC_Filesystemview('/'.$user.'/files_trashbin'); +$view = new OC_Filesystemview('/'.$user.'/files_trashbin/files'); OCP\Util::addStyle('files', 'files'); OCP\Util::addScript('files', 'filelist'); @@ -19,7 +19,6 @@ $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; $result = array(); if ($dir) { $dirlisting = true; - $view = new \OC_FilesystemView('/'.\OCP\User::getUser().'/files_trashbin'); $fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); $dirContent = opendir($fullpath); $i = 0; @@ -96,6 +95,7 @@ $list->assign('disableDownloadActions', true); $tmpl->assign('breadcrumb', $breadcrumbNav->fetchPage(), false); $tmpl->assign('fileList', $list->fetchPage(), false); $tmpl->assign('files', $files); +$tmpl->assign('dirlisting', $dirlisting); $tmpl->assign('dir', OC_Filesystem::normalizePath($view->getAbsolutePath())); $tmpl->printPage(); |