merging 7.1.4 changes

This commit is contained in:
JT Smith 2006-11-03 04:36:13 +00:00
parent 3d878c09c7
commit aeba6ec83c
18 changed files with 92 additions and 73 deletions

View file

@ -378,7 +378,10 @@ sub getLineage {
$where = "asset.state='published'";
}
## get only approved items or those that i'm currently working on
my $archived = " or assetData.status='archived' " if ($rules->{includeArchived});
my $archived = "";
if ($rules->{includeArchived}) {
$archived = " or assetData.status='archived' ";
}
$where .= " and (assetData.status='approved' $archived or assetData.tagId=".$self->session->db->quote($self->session->scratch->get("versionTag")).")";
## class exclusions
if (exists $rules->{excludeClasses}) {