summaryrefslogtreecommitdiffstats
path: root/lib/helper.php
diff options
context:
space:
mode:
authorGeorg Ehrke <developer@georgehrke.com>2013-08-30 18:11:18 +0200
committerGeorg Ehrke <developer@georgehrke.com>2013-08-30 18:11:18 +0200
commit8ef40277b21688112c48d40a9c80a519c3e7460c (patch)
treee1dce17e21c734964aec2ae432d03677d7f32d57 /lib/helper.php
parent40cee5639e89ad052ba5234a28e5f197f2fd70ba (diff)
parent0f5df181a3b1f88075193fca0bed88f289314c8e (diff)
downloadnextcloud-server-8ef40277b21688112c48d40a9c80a519c3e7460c.tar.gz
nextcloud-server-8ef40277b21688112c48d40a9c80a519c3e7460c.zip
Merge master into oc_preview
Diffstat (limited to 'lib/helper.php')
-rw-r--r--lib/helper.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/helper.php b/lib/helper.php
index afeb3771048..5fb8fed3459 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -904,10 +904,8 @@ class OC_Helper {
} else {
$total = $free; //either unknown or unlimited
}
- if ($total == 0) {
- $total = 1; // prevent division by zero
- }
- if ($total >= 0) {
+ if ($total > 0) {
+ // prevent division by zero or error codes (negative values)
$relative = round(($used / $total) * 10000) / 100;
} else {
$relative = 0;