summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-12-04 14:20:29 +0100
committerBjoern Schiessle <schiessle@owncloud.com>2013-12-04 16:11:40 +0100
commit6b7fdda4f5b11c1ec92cd66270c2aa37f7324432 (patch)
tree8f317faa92625ccb0551b3fe83d6b58e921430da /apps/files_trashbin
parent8fdbb988995099fc2bd79ca5704120873952651b (diff)
downloadnextcloud-server-6b7fdda4f5b11c1ec92cd66270c2aa37f7324432.tar.gz
nextcloud-server-6b7fdda4f5b11c1ec92cd66270c2aa37f7324432.zip
config switch to disable auto expire for the trash bin
Diffstat (limited to 'apps/files_trashbin')
-rw-r--r--apps/files_trashbin/lib/trashbin.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 48d43b059fa..567f88b91b1 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -778,8 +778,13 @@ class Trashbin {
*/
private static function expire($trashbinSize, $user) {
+ // let the admin disable auto expire
+ $autoExpire = \OC_Config::getValue('trashbin_auto_expire', true);
+ if ($autoExpire === false) {
+ return 0;
+ }
+
$user = \OCP\User::getUser();
- $view = new \OC\Files\View('/' . $user);
$availableSpace = self::calculateFreeSpace($trashbinSize);
$size = 0;