diff options
| author | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
|---|---|---|
| committer | Georg Ehrke <developer@georgehrke.com> | 2013-07-10 12:41:53 +0200 |
| commit | a357e5b284ed5b752864e4570cb179f3f2d88229 (patch) | |
| tree | e811ea2288b5dfa069908f25f696f795a268cb53 /lib/helper.php | |
| parent | 832779804d36d27c47325d1dcce09e566c8cee60 (diff) | |
| parent | 5387e5c354440b264040816ea7fcaf6783a2ebdc (diff) | |
| download | nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.tar.gz nextcloud-server-a357e5b284ed5b752864e4570cb179f3f2d88229.zip | |
merge conflicts ...
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/helper.php b/lib/helper.php index 326f2567f99..856dba625b3 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -798,9 +798,9 @@ class OC_Helper { $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); $freeSpace = \OC\Files\Filesystem::free_space($dir); - if ($upload_max_filesize == 0 and $post_max_size == 0) { + if ((int)$upload_max_filesize === 0 and (int)$post_max_size === 0) { $maxUploadFilesize = \OC\Files\FREE_SPACE_UNLIMITED; - } elseif ($upload_max_filesize === 0 or $post_max_size === 0) { + } elseif ((int)$upload_max_filesize === 0 or (int)$post_max_size === 0) { $maxUploadFilesize = max($upload_max_filesize, $post_max_size); //only the non 0 value counts } else { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); |