diff options
| author | Arthur Schiwon <blizzz@owncloud.com> | 2016-02-09 17:16:43 +0100 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@owncloud.com> | 2016-02-09 17:16:43 +0100 |
| commit | 3a796d1e1533febc63a2719816815b47f2065e82 (patch) | |
| tree | 3fdf9dab718f2a186341d875763c6f8fafd5b7db /apps/files_trashbin | |
| parent | 4659bf9b4a880376e690d3ca52e855a861c143f1 (diff) | |
| download | nextcloud-server-3a796d1e1533febc63a2719816815b47f2065e82.tar.gz nextcloud-server-3a796d1e1533febc63a2719816815b47f2065e82.zip | |
Consolidate getQuota and setQuota methods in User instance
Diffstat (limited to 'apps/files_trashbin')
| -rw-r--r-- | apps/files_trashbin/lib/trashbin.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php index ca3a8b178a2..c91cfe082fd 100644 --- a/apps/files_trashbin/lib/trashbin.php +++ b/apps/files_trashbin/lib/trashbin.php @@ -564,11 +564,8 @@ class Trashbin { $config = \OC::$server->getConfig(); $softQuota = true; - $quota = $config->getUserValue($user, 'files', 'quota', null); + $quota = \OC::$server->getUserManager()->get($user)->getQuota(); $view = new \OC\Files\View('/' . $user); - if ($quota === null || $quota === 'default') { - $quota = $config->getAppValue('files', 'default_quota', null); - } if ($quota === null || $quota === 'none') { $quota = \OC\Files\Filesystem::free_space('/'); $softQuota = false; |