diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2014-06-18 15:32:16 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2014-06-18 15:32:16 +0200 |
| commit | edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244 (patch) | |
| tree | ad2e02faba4983acdc1d2cf2b4615c1f6f127dad /apps/files_trashbin/ajax/delete.php | |
| parent | a921ad89259f1d580292d649a58160fab7a2a2d7 (diff) | |
| parent | bcc88be4c77abf1dce0905c5bf67c1c8347b00f7 (diff) | |
| download | nextcloud-server-edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244.tar.gz nextcloud-server-edbc6b5db12fe16b6ea7dfb10d116aa9da4e2244.zip | |
Merge pull request #9068 from owncloud/trashbin_unittests_master
fix trash bin expire operation and add unit tests
Diffstat (limited to 'apps/files_trashbin/ajax/delete.php')
| -rw-r--r-- | apps/files_trashbin/ajax/delete.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php index ebabc5bc7a2..9d9c1dd100f 100644 --- a/apps/files_trashbin/ajax/delete.php +++ b/apps/files_trashbin/ajax/delete.php @@ -37,7 +37,7 @@ foreach ($list as $file) { $timestamp = null; } - OCA\Files_Trashbin\Trashbin::delete($filename, $timestamp); + OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp); if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { $error[] = $filename; OC_Log::write('trashbin','can\'t delete ' . $filename . ' permanently.', OC_Log::ERROR); |