Merge branch 'stable-3.1'

Marius Burkard

2016-07-01 49441bdd0f3ff75d5092d5b832b97ea722a66363

 interface/lib/classes/quota_lib.inc.php

@@ -312,13 +312,13 @@
   
            $databases[$i]['quota_raw'] = $databases[$i]['database_quota'];
            $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;
            $databases[$i]['used_percentage'] = (($databases[$i]['database_quota'] > 0) && ($databases[$i]['used'] > 0)) ? round($databases[$i]['used_raw'] * 100 / $databases[$i]['database_quota']) : 0;
   
            if ($readable) {
               // colours
               $databases[$i]['display_colour'] = '#000000';
               if($databases[$i]['database_quota'] > 0){
                  $used_ratio = $databases[$i]['used']/$databases[$i]['database_quota'];
                  $used_ratio = $databases[$i]['used'] / $databases[$i]['database_quota'];
               } else {
                  $used_ratio = 0;
               }