From 75457b765d0904f1ab6dbc7f0198fb508bb6e6f6 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Thu, 19 Jul 2007 18:18:16 +0000
Subject: [PATCH] fix: macros not processed in HttpProxy template

---
 docs/changelog/7.x.x.txt              | 2 ++
 lib/WebGUI/Asset/Wobject/HttpProxy.pm | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 637b63550..19864d4cf 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -73,6 +73,8 @@
    user's e-mail address.
  - add: Button in Collaboration Systems for managing CS subscription group.
  - fix: relative links sent out in emails don't work properly
+ - fix: macros not processed in HttpProxy template
+    http://www.webgui.org/bugs/tracker/macro-not-working-i-httpproxy
 
 7.3.21
  - fix: Self-deactivation doesn't show login screen after success
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy.pm b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
index 327d56a6c..d58a8aaa3 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy.pm
@@ -419,7 +419,12 @@ sub view {
 	if($var{header} ne "text/html") {
 		return $var{content};
 	} else {
-		return $self->processTemplate(\%var,undef,$self->{_viewTemplate});
+	    my $content = $var{content};
+	    $var{content} = '~~~';
+	    my $output = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
+	    WebGUI::Macro::process($self->session, \$output);
+	    my ($head, $foot) = split('~~~', $output);
+	    return $head . $content . $foot;
 	}
 }