From 3151a029dec7d9f99c7bc15fd6e9d8e27a4dd4b7 Mon Sep 17 00:00:00 2001
From: Doug Bell <doug@plainblack.com>
Date: Fri, 3 Jun 2011 20:50:19 -0500
Subject: [PATCH] we don't always have an asset, so use the page url instead

---
 lib/WebGUI/Macro/AssetProxy.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/WebGUI/Macro/AssetProxy.pm b/lib/WebGUI/Macro/AssetProxy.pm
index 985538d91..b39d85456 100644
--- a/lib/WebGUI/Macro/AssetProxy.pm
+++ b/lib/WebGUI/Macro/AssetProxy.pm
@@ -44,7 +44,7 @@ sub process {
     my ($session, $identifier, $type) = @_;
     if (!$identifier) {
         $session->errorHandler->warn('AssetProxy macro called without an asset to proxy. ' 
-        . 'The macro was called through this url: '.$session->asset->get('url'));
+        . 'The macro was called through this url: '.$session->url->page);
         if ($session->var->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('invalid url');
@@ -61,7 +61,7 @@ sub process {
     }
     if (!defined $asset) {
         $session->errorHandler->warn('AssetProxy macro called invalid asset: '.$identifier
-            .'. The macro was called through this url: '.$session->asset->get('url'));
+            .'. The macro was called through this url: '.$session->url->page);
         if ($session->var->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('invalid url');
@@ -69,7 +69,7 @@ sub process {
     }
     elsif ($asset->get('state') =~ /^trash/) {
         $session->errorHandler->warn('AssetProxy macro called on asset in trash: '.$identifier
-            .'. The macro was called through this url: '.$session->asset->get('url'));
+            .'. The macro was called through this url: '.$session->url->page);
         if ($session->var->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('asset in trash');
@@ -77,7 +77,7 @@ sub process {
     }
     elsif ($asset->get('state') =~ /^clipboard/) {
         $session->errorHandler->warn('AssetProxy macro called on asset in clipboard: '.$identifier
-            .'. The macro was called through this url: '.$session->asset->get('url'));
+            .'. The macro was called through this url: '.$session->url->page);
         if ($session->var->isAdminOn) {
             my $i18n = WebGUI::International->new($session, 'Macro_AssetProxy');
             return $i18n->get('asset in clipboard');