From 65a6de80385ba39eba21877557b97e182d2b230e Mon Sep 17 00:00:00 2001
From: Yung Han Khoe <yung@webgui-svn>
Date: Fri, 30 May 2008 16:32:32 +0000
Subject: [PATCH] Changed AssetProxy macro's error handling

---
 lib/WebGUI/Macro/AssetProxy.pm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index d4032da4d..8eb921fdc 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -62,8 +62,15 @@ sub process {
 		return undef;
 	} 
     else {
-		my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
-		return $i18n->get('invalid url');
+        $session->errorHandler->warn('AssetProxy macro called invalid asset: '.$identifier
+            .'. The macro was called through this url: '.$session->asset->get('url'));
+        if ($session->var->get("adminOn")){
+    		my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
+	    	return $i18n->get('invalid url');
+        }
+        else{
+            return '';
+        }
 	}
 }