diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-10 11:03:07 +0200 |
|---|---|---|
| committer | Bjoern Schiessle <schiessle@owncloud.com> | 2013-07-29 13:36:06 +0200 |
| commit | 2c8e5ec84ff98088fb9e3b275735098beaa5e27f (patch) | |
| tree | e0cf14263f97b2b3296ca52a6422dbe74b0ad598 /apps/files_trashbin | |
| parent | 48621115c10f62f776dbe41ad9a51c1ac360fc8c (diff) | |
| download | nextcloud-server-2c8e5ec84ff98088fb9e3b275735098beaa5e27f.tar.gz nextcloud-server-2c8e5ec84ff98088fb9e3b275735098beaa5e27f.zip | |
user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
settings/templates/personal.php
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 b9d900dfab4..cdf8d950e60 100644 --- a/apps/files_trashbin/lib/trash.php +++ b/apps/files_trashbin/lib/trash.php @@ -693,7 +693,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`' |