From 16173f8aaa10687d80bde6e6e5c292a178f93c21 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Mon, 26 Jul 2010 10:44:57 -0700 Subject: [PATCH] Don't call newByLineage, if we know there's no lineage. --- lib/WebGUI/AssetLineage.pm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm index eb73ae990..edbc434c3 100644 --- a/lib/WebGUI/AssetLineage.pm +++ b/lib/WebGUI/AssetLineage.pm @@ -334,13 +334,15 @@ sub getFirstChild { my $lineage = $assetLineage->{firstChild}{$self->getId}; unless ($lineage) { ($lineage) = $self->session->db->quickArray("select min(asset.lineage) from asset,assetData where asset.parentId=? and asset.assetId=assetData.assetId and asset.state='published'",[$self->getId]); - unless ($self->session->config->get("disableCache")) { + if ($lineage && !$self->session->config->get("disableCache")) { $assetLineage->{firstChild}{$self->getId} = $lineage; $self->session->stow->set("assetLineage", $assetLineage); } } - $child = WebGUI::Asset->newByLineage($self->session,$lineage); - $self->cacheChild(first => $child); + if ($lineage) { + $child = WebGUI::Asset->newByLineage($self->session,$lineage); + $self->cacheChild(first => $child); + } } return $child; }