From d27b5b0066f87733be0d050b5726a1b57431425c Mon Sep 17 00:00:00 2001
From: David Delikat <david-delikat@usa.net>
Date: Mon, 12 Jan 2009 22:28:46 +0000
Subject: [PATCH] fixed bug 9428: ASSET::get now includes keywords when called
 without a property name.

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

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b42f3552b..f7859985e 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.6.9
+ - fixed #9428: added code to ASSET::get to include keywords when no property name is requested
  - marked sbin scripts as executable
  - Problem #9492: in passing form variables to Macro SQL inside a snippet
 
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index f3c4b6961..3c3836bdf 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -753,6 +753,8 @@ sub get {
 		return $self->{_properties}{$propertyName};
 	}
 	my %copyOfHashRef = %{$self->{_properties}};
+        my $keywords = WebGUI::Keyword->new($self->session)->getKeywordsForAsset({asset => $self});
+        if( $keywords ne '' ) { $copyOfHashRef{ keywords } = $keywords ; }
 	return \%copyOfHashRef;
 }