oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the AssetProxy macro.

Browse source
This commit is contained in:
Colin Kuskie 2010-01-27 22:00:56 -08:00
parent 972ba033ec
commit 136c8cdc73
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Macro/AssetProxy.pm
View file

@ -14,6 +14,7 @@ use strict;
use Time::HiRes; use Time::HiRes;
use WebGUI::Asset; use WebGUI::Asset;
use WebGUI::International; use WebGUI::International;
use WebGUI::Exception;
=head1 NAME =head1 NAME
@ -45,12 +46,12 @@ sub process {
my $t = ($session->errorHandler->canShowPerformanceIndicators()) ? [Time::HiRes::gettimeofday()] : undef; my $t = ($session->errorHandler->canShowPerformanceIndicators()) ? [Time::HiRes::gettimeofday()] : undef;
my $asset; my $asset;
if ($type eq 'assetId') { if ($type eq 'assetId') {
$asset = WebGUI::Asset->newById($session, $identifier); $asset = eval { WebGUI::Asset->newById($session, $identifier); };
} }
else { else {
$asset = WebGUI::Asset->newByUrl($session,$identifier); $asset = eval { WebGUI::Asset->newByUrl($session,$identifier); };
} }
if (!defined $asset) { if (WebGUI::Exception->caught()) {
$session->errorHandler->warn('AssetProxy macro called invalid asset: '.$identifier $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->asset->get('url'));
if ($session->var->isAdminOn) { if ($session->var->isAdminOn) {