diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:05:30 +0100 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-02-21 00:05:30 +0100 |
| commit | 6aed7abfbe4a58cec822bdd16d8c71d4bac14c28 (patch) | |
| tree | 9dd60cd8ac13d2e5a0bd147a8c79a4a49d6416bf /apps/files_trashbin/index.php | |
| parent | fc1fba23040908fe5629f89b66a280aea5578520 (diff) | |
| parent | eb3769e6d6e1b26d2c20c7b26c6a334a5d761f08 (diff) | |
| download | nextcloud-server-6aed7abfbe4a58cec822bdd16d8c71d4bac14c28.tar.gz nextcloud-server-6aed7abfbe4a58cec822bdd16d8c71d4bac14c28.zip | |
Merge branch 'master' into trashbin_encryption
Diffstat (limited to 'apps/files_trashbin/index.php')
| -rw-r--r-- | apps/files_trashbin/index.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php index d575c75f1a3..2276fee2f81 100644 --- a/apps/files_trashbin/index.php +++ b/apps/files_trashbin/index.php @@ -16,6 +16,7 @@ OCP\Util::addScript('files', 'filelist'); $dir = isset($_GET['dir']) ? stripslashes($_GET['dir']) : ''; +$result = array(); if ($dir) { $dirlisting = true;
$fullpath = \OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath($dir); @@ -36,7 +37,7 @@ if ($dir) { ); }
} - closedir($fullpath); + closedir($dirContent); } else { $dirlisting = false; |