Merge branch 'fix-db-stats' into 'stable-3.1'

Till Brehm

2016-06-16 8225ad2d0778160477c5b23e6fc14d608578b796

 interface/web/sites/database_quota_stats.php

@@ -29,7 +29,7 @@
      foreach($tmp_array as $database_name => $data) {
         $db_name = $data['database_name'];

         $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name);
         $temp = $app->db->queryOneRecord("SELECT client.username, web_database.database_quota FROM web_database, sys_group, client WHERE sys_group.groupid = web_database.sys_groupid AND sys_group.client_id = client.client_id AND web_database.database_name = ?", $db_name);
         if(is_array($temp) && !empty($temp)) {
            $monitor_data[$server_id.'.'.$db_name]['database_name'] = $data['database_name'];
            $monitor_data[$server_id.'.'.$db_name]['client'] = isset($temp['username']) ? $temp['username'] : '';