From 77b09dee3751a488c6d11e85a03f0fe447674589 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Wed, 5 Mar 2008 04:56:44 +0000
Subject: [PATCH] fixed: Child assets not indicated by plus sign in uncommited
 tags

---
 docs/changelog/7.x.x.txt   | 1 +
 lib/WebGUI/AssetLineage.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9dec20fec..9033ae39f 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -4,6 +4,7 @@
  - Removed some spurious warnings from the calendar.
  - Added ability to edit comments. Entirely changed how comments work in prep
    for turning it into a mixin.
+ - fixed: Child assets not indicated by plus sign in uncommited tags
 
 7.5.4
  - fixed: unable to remove calendar feeds in IE6
diff --git a/lib/WebGUI/AssetLineage.pm b/lib/WebGUI/AssetLineage.pm
index faf7e1a7d..f511e4d57 100644
--- a/lib/WebGUI/AssetLineage.pm
+++ b/lib/WebGUI/AssetLineage.pm
@@ -188,7 +188,7 @@ sub getChildCount {
 	my $self = shift;
     my $opts = shift || {};
 	my $stateWhere = $opts->{includeTrash} ? '' : "asset.state='published' and";
-	my ($count) = $self->session->db->quickArray("select count(*) from asset, assetData where asset.assetId=assetData.assetId and $stateWhere parentId=? and assetData.status in ('approved', 'archived')", [$self->getId]);
+	my ($count) = $self->session->db->quickArray("select count(*) from asset, assetData where asset.assetId=assetData.assetId and $stateWhere parentId=? and (assetData.status in ('approved', 'archived') or assetData.tagId=?)", [$self->getId, $self->session->scratch->get('versionTag')]);
 	return $count;
 }