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

missed some things

Browse source
This commit is contained in:
Doug Bell 2008-05-29 18:39:13 +00:00
parent d43065b122
commit 03181810d6
2 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/WebGUI/Asset.pm
View file

@ -1473,16 +1473,14 @@ sub new {
my $session = shift;
my $assetId = shift;
my $className = shift;
my $revisionDate = shift || $class->getCurrentRevisionDate($session, $assetId);
my $revisionDate = shift;
unless (defined $assetId) {
$session->errorHandler->error("Asset constructor new() requires an assetId.");
return undef;
}
return undef unless ($revisionDate);
unless ($class ne 'WebGUI::Asset' or defined $className) {
if ($class eq 'WebGUI::Asset' && !$className) {
($className) = $session->db->quickArray("select className from asset where assetId=?", [$assetId]);
unless ($className) {
$session->errorHandler->error("Couldn't instantiate asset: ".$assetId. ": couldn't find class name");
@ -1494,7 +1492,14 @@ sub new {
$class = $class->loadModule($session, $className);
return undef unless (defined $class);
}
if ( !$revisionDate ) {
$revisionDate = $className
? $className->getCurrentRevisionDate( $session, $assetId )
: $class->getCurrentRevisionDate( $session, $assetId );
return undef unless $revisionDate;
}
my $cache = WebGUI::Cache->new($session, ["asset",$assetId,$revisionDate]);
my $properties = $cache->get;
if (exists $properties->{assetId}) {