Merge branch 'stable-3.1'

Marius Burkard

2016-02-11 a7796bec1be01b51f400e9a3a698535b12b636aa

 interface/web/dashboard/dashlets/quota.php

@@ -16,7 +16,7 @@
      if(is_file($lng_file)) include $lng_file;
      $tpl->setVar($wb);

      $sites = $app->quota_lib->get_quota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['default_group'] : null);
      $sites = $app->quota_lib->get_quota_data( ($_SESSION["s"]["user"]["typ"] != 'admin') ? $_SESSION['s']['user']['client_id'] : null);
      //print_r($sites);

      $has_quota = false;