summaryrefslogtreecommitdiffstats
path: root/lib/helper.php
diff options
context:
space:
mode:
authorRoland Hager <roland.hager@tu-berlin.de>2013-06-13 09:18:50 +0200
committerRoland Hager <roland.hager@tu-berlin.de>2013-06-21 09:33:06 +0200
commita06d901e3782a58f3f98bac4eca81430e56089ae (patch)
tree7b3836a0988133df987bcdf973542a55616ef929 /lib/helper.php
parent8c923a85dee0af07960c05902b187a0e7cbca34e (diff)
downloadnextcloud-server-a06d901e3782a58f3f98bac4eca81430e56089ae.tar.gz
nextcloud-server-a06d901e3782a58f3f98bac4eca81430e56089ae.zip
Fix: The check if upload_max_filesize or post_max_size is 0 fails if only one of them is 0.
$upload_max_filesize and $post_max_size need to be casted to (int) to match "=== 0"
Diffstat (limited to 'lib/helper.php')
-rw-r--r--lib/helper.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/helper.php b/lib/helper.php
index a315c640d1a..1860a55fc8f 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -787,9 +787,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);