From ee60c95a22aad82742bd9da439acd6ee8f0796af Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Tue, 12 Jan 2016 09:08:44 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
interface/lib/classes/quota_lib.inc.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/quota_lib.inc.php b/interface/lib/classes/quota_lib.inc.php
index 24a3ce3..8c91139 100644
--- a/interface/lib/classes/quota_lib.inc.php
+++ b/interface/lib/classes/quota_lib.inc.php
@@ -250,7 +250,7 @@
$databases[$i]['used'] = isset($monitor_data[$databasename]['size']) ? $monitor_data[$databasename]['size'] : 0;
$databases[$i]['quota_raw'] = $databases[$i]['database_quota'];
- $databases[$i]['used_raw'] = $databases[$i]['used'];
+ $databases[$i]['used_raw'] = $databases[$i]['used'] / 1024 / 1024; //* quota is stored as MB - calculated bytes
$databases[$i]['used_percentage'] = (($databases[$i]['database_quota'] > 0) && ($databases[$i]['used'] > 0)) ? round($databases[$i]['used'] * 100 / $databases[$i]['database_quota']) : 0;
if ($readable) {
@@ -267,7 +267,7 @@
if($databases[$i]['database_quota'] == 0){
$databases[$i]['database_quota'] = $app->lng('unlimited');
} else {
- $databases[$i]['database_quota'] = round($databases[$i]['database_quota'] / 1048576, 4).' MB';
+ $databases[$i]['database_quota'] = $databases[$i]['database_quota'] . ' MB';
}
@@ -283,4 +283,4 @@
return $databases;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1