Commit 8652e3e7 authored by metzlerd's avatar metzlerd
Browse files

Consistently pass includes.

parent 57158d23
......@@ -237,7 +237,7 @@ class FrxReportGenerator {
$r->processParameters();
Frx::Skin()->load($r->skin);
Frx::Skin()->loadSkinFiles($name);
$r->render($format);
$r->render($format, $print);
$o = Frx::Document($format);
if ($o) {
$output .= $o->render($r, $format, array());
......
......@@ -833,7 +833,7 @@ function forena_report_include($report_name, $parms=array()) {
//check for default parameters
$r->processParameters();
$format = $desc['format'];
$r->render($format);
$r->render($format, FALSE);
$o = Frx::Document($format);
if ($o) {
......
......@@ -314,7 +314,7 @@ function forena_query_preview($form, &$form_state) {
if ($fields) {
$report = $t->asXML();
$rpt = new FrxReport($report, $data);
$preview = $rpt->render('web');
$preview = $rpt->render('web', FALSE);
}
else {
if (is_object($data) && method_exists($data, 'asXML')) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment