From f2108d88a2519cfa51fa84702b0caec72b6f079d Mon Sep 17 00:00:00 2001
From: Matthew Wilson <matt@plainblack.com>
Date: Thu, 12 May 2005 21:07:23 +0000
Subject: [PATCH]  - fix [ 1180455 ] assetproxy of a nonexistent asset inserts
 the page_not_found

---
 lib/WebGUI/Macro/AssetProxy.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index a5ad949d2..16921a0bd 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -19,7 +19,8 @@ use WebGUI::Session;
 sub process {
         my ($url) = WebGUI::Macro::getParams(shift);
 	my $asset = WebGUI::Asset->newByUrl($url);
-	if (defined $asset) {
+	#Sorry, you cannot proxy the notfound page.
+	if (defined $asset && $asset->getId ne $session{setting}{notFoundPage}) {
 		$asset->toggleToolbar;
 		return $asset->canView ? $asset->view : undef;
 	} else {