From 110a236fcd4760f9bebd2903c9199f0c7fb0a5d2 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 16 Nov 2009 17:03:38 -0800 Subject: [PATCH] When using a download template, macros are always processed in the output. fixes bug #11242. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/SQLReport.pm | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 8615b4aab..cbcb04e58 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -19,6 +19,7 @@ - added USPS International driver. - added #10727: language choice during site adding - added file globbing to preload.exclude + - fixed #11242: Macros not executing in Download Templates 7.8.4 - Fixed a compatibility problem between WRE and new Spectre code. diff --git a/lib/WebGUI/Asset/Wobject/SQLReport.pm b/lib/WebGUI/Asset/Wobject/SQLReport.pm index 5d5e2632b..53fd221a8 100644 --- a/lib/WebGUI/Asset/Wobject/SQLReport.pm +++ b/lib/WebGUI/Asset/Wobject/SQLReport.pm @@ -474,7 +474,9 @@ sub download { } elsif ($self->getValue("downloadType") eq "template") { my $data = $self->_processQuery(1,0); - return $self->processTemplate($data,$self->get("downloadTemplateId")); + my $output = $self->processTemplate($data,$self->get("downloadTemplateId")); + WebGUI::Macro::process($self->session, \$output); + return $output; } else { # I don't know what to do