diff options
| author | icewind1991 <robin@icewind.nl> | 2014-02-12 15:48:14 +0100 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-02-12 15:48:14 +0100 |
| commit | 7af456730eef4a1c947188c12d69a0caf0a5bd2b (patch) | |
| tree | 48fd8ad0f58e14241f955c956f86fa9c83fce8ee /lib/public | |
| parent | 3699728a3a02dd17ea617a7e8f781c09e837f360 (diff) | |
| parent | 753af3a3ff17d9126a738f292b3922981bd5673d (diff) | |
| download | nextcloud-server-7af456730eef4a1c947188c12d69a0caf0a5bd2b.tar.gz nextcloud-server-7af456730eef4a1c947188c12d69a0caf0a5bd2b.zip | |
Merge pull request #6964 from owncloud/storagestatistics-reuse
Reuse the calculated free_space in buildFileStorageStatistics
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/util.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/public/util.php b/lib/public/util.php index d8497e29cfc..4611e5e2650 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -460,11 +460,12 @@ class Util { /** * calculates the maximum upload size respecting system settings, free space and user quota * - * @param $dir the current folder where the user currently operates + * @param string $dir the current folder where the user currently operates + * @param int $free the number of bytes free on the storage holding $dir, if not set this will be received from the storage directly * @return number of bytes representing */ - public static function maxUploadFilesize($dir) { - return \OC_Helper::maxUploadFilesize($dir); + public static function maxUploadFilesize($dir, $free = null) { + return \OC_Helper::maxUploadFilesize($dir, $free); } /** |