Merge branch 'master' into WebGUI8, up to 7.9.10. Some tests failing due to changes in default content.

This commit is contained in:
Colin Kuskie 2010-07-27 22:55:57 -07:00
commit ca9a3bd6c7
34 changed files with 386 additions and 49 deletions

View file

@ -342,8 +342,10 @@ sub getFirstChild {
my $lineage = $assetLineage->{firstChild}{$self->getId};
unless ($lineage) {
($lineage) = $self->session->db->quickArray("select min(asset.lineage) from asset where asset.parentId=? and asset.state='published'",[$self->getId]);
$assetLineage->{firstChild}{$self->getId} = $lineage;
$self->session->stow->set("assetLineage", $assetLineage);
if ($lineage) {
$assetLineage->{firstChild}{$self->getId} = $lineage;
$self->session->stow->set("assetLineage", $assetLineage);
}
}
$child = eval { WebGUI::Asset->newByLineage($self->session,$lineage); };
$self->cacheChild(first => $child);