merging 5.4.4 changes

This commit is contained in:
JT Smith 2003-09-14 17:56:39 +00:00
parent eb4a6bca87
commit 2b6d4a36fc
5 changed files with 56 additions and 27 deletions

View file

@ -18,8 +18,11 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
return '<img src="'.$collateral->getURL.'" '.$collateral->get("parameters").' />';
if (my $collateral = WebGUI::Collateral->find($param[0])) {
return '<img src="'.$collateral->getURL.'" '.$collateral->get("parameters").' />';
} else {
return "";
}
}

View file

@ -18,8 +18,11 @@ use WebGUI::Session;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateral = WebGUI::Collateral->find($param[0]);
return $collateral->getURL;
if (my $collateral = WebGUI::Collateral->find($param[0])) {
return $collateral->getURL;
} else {
return "";
}
}