From bc1085bf6183341511a56f8f90e19b2837ec742c Mon Sep 17 00:00:00 2001 From: Robin Sonefors Date: Tue, 27 May 2014 11:44:53 +0200 Subject: [PATCH] Revert "Revert "reports: Synergy reports are report types"" And now we're back on master, and we want the patch again. Sigh. This reverts commit 412a87875193e435c80b8f623db390cedaf8d25f. --- modules/reports/controllers/reports.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/reports/controllers/reports.php b/modules/reports/controllers/reports.php index a6d80575e..c4e0e7477 100644 --- a/modules/reports/controllers/reports.php +++ b/modules/reports/controllers/reports.php @@ -441,9 +441,9 @@ class Reports_Controller extends Base_reports_Controller } if(ninja::has_module('synergy') && $this->options['include_synergy_events']) { - $synergy_report_model = new Synergy_report_Model; + $synergy_report_model = new Synergy_report_Model($this->options); $synergy_content = $this->add_view('reports/synergy'); - $synergy_content->synergy_events = $synergy_report_model->get_data($this->options); + $synergy_content->synergy_events = $synergy_report_model->get_data(); $this->template->content->synergy_content = $synergy_content; } sort($this->xtra_js); -- 2.11.4.GIT