diff options
| author | Björn Schießle <bjoern@schiessle.org> | 2013-08-18 09:51:48 -0700 |
|---|---|---|
| committer | Björn Schießle <bjoern@schiessle.org> | 2013-08-18 09:51:48 -0700 |
| commit | 9be836814cb4165ea54a086a0f97526d783bcd37 (patch) | |
| tree | ad57d30194571edcf0f51cd83178b8ac2f03c0aa /apps/files_trashbin | |
| parent | c620c5840ab8ca45531c7639e086bafbd87d7365 (diff) | |
| parent | d544a371bfb84f36a3b789d19d44d6694de21c48 (diff) | |
| download | nextcloud-server-9be836814cb4165ea54a086a0f97526d783bcd37.tar.gz nextcloud-server-9be836814cb4165ea54a086a0f97526d783bcd37.zip | |
Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/trash.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trash.php index 30913e00a47..323f25eac2f 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -717,7 +717,7 @@ class Trashbin { \OC_Log::write('files_trashbin', 'remove "' . $filename . '" fom trash bin because it is older than ' . $retention_obligation, \OC_log::INFO); } } - $availableSpace = $availableSpace + $size; + $availableSpace += $size; // if size limit for trash bin reached, delete oldest files in trash bin if ($availableSpace < 0) { $query = \OC_DB::prepare('SELECT `location`,`type`,`id`,`timestamp` FROM `*PREFIX*files_trash`' |