From 5c6b40b28ead1157260e4abc2e697a696f69520e Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Tue, 31 Jan 2017 15:45:28 +0100
Subject: [statistics_reporting] Make getdata functions options flag based in
 preparation of data export

---
 modules-available/statistics_reporting/page.inc.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules-available/statistics_reporting/page.inc.php')

diff --git a/modules-available/statistics_reporting/page.inc.php b/modules-available/statistics_reporting/page.inc.php
index 0309be68..052d813d 100644
--- a/modules-available/statistics_reporting/page.inc.php
+++ b/modules-available/statistics_reporting/page.inc.php
@@ -33,11 +33,11 @@ class Page_Statistics_Reporting extends Page
 			GetData::$lowerTimeBound = Request::get('lower', 0, 'int');
 			GetData::$upperTimeBound = Request::get('upper', 24, 'int');
 
-			$data = array_merge(GetData::total(), array('perLocation' => array(), 'perClient' => array(), 'perUser' => array(), 'perVM' => array()));
-			$data['perLocation'] = GetData::perLocation();
-			$data['perClient'] = GetData::perClient();
-			$data['perUser'] = GetData::perUser();
-			$data['perVM'] = GetData::perVM();
+			$data = GetData::total(GETDATA_PRINTABLE);
+			$data['perLocation'] = GetData::perLocation(GETDATA_PRINTABLE);
+			$data['perClient'] = GetData::perClient(GETDATA_PRINTABLE);
+			$data['perUser'] = GetData::perUser(GETDATA_PRINTABLE);
+			$data['perVM'] = GetData::perVM(GETDATA_PRINTABLE);
 
 			Render::addTemplate('columnChooser');
 			Render::addTemplate('_page', $data);
-- 
cgit v1.2.3-55-g7522