Merge branch 'master' into develop

This commit is contained in:
Björn Fromme
2019-09-11 12:45:21 +02:00
@@ -173,7 +173,7 @@ class ResellerController extends ActionController
throw new InvalidArgumentValueException();
}
$cacheKey = sprintf('reseller_export_csv_full_%d', $reseller->getUid());
$cacheKey = sprintf('reseller_export_csv_%s_%d', $type, $reseller->getUid());
if (($csv = $this->cache->get($cacheKey)) === false) {
$data = $this->resellerDataService->preprocessAll(