From 49212c2b44d2b133b24a19ea5a057e8421cfb6f1 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 6 Dec 2005 21:43:09 +0000
Subject: [PATCH] - Removed duplicate processing of metadata.  - fix [ 1373649
 ] Username isn't populated in 6.8.0 Discussions

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

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index d9f2a1910..b1c9b5847 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -1,4 +1,6 @@
 6.8.1
+ - Removed duplicate processing of metadata.
+ - fix [ 1373649 ] Username isn't populated in 6.8.0 Discussions
  - Upgraded TinyMCE to 2.0.1, which allows the rich editor to work with
    Firefox 1.5.
  - Added test class for User.pm (Roy Johnson / Ocean View Web Creations)
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index e8a432a93..434faf4c3 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1168,27 +1168,6 @@ sub processPropertiesFromFormPost {
 	}
 	WebGUI::SQL->beginTransaction;
 	$self->update(\%data);
-	foreach my $form (keys %{$session{form}}) {
-		if ($form =~ /^metadata_(.*)$/) {
-			my $fieldId = $1; 
-			my ($exists) = WebGUI::SQL->quickArray("select count(*) from metaData_values
-							where assetId = ".quote($self->getId)."
-							and fieldId = ".quote($fieldId));
-			if(! $exists && $session{form}{$form} ne "") {
-				WebGUI::SQL->write("insert into metaData_values (fieldId, assetId)
-							values (".quote($fieldId).",".quote($self->getId).")");
-			}
-			if($session{form}{$form} eq "") {
-				# Keep it clean
-				WebGUI::SQL->write("delete from metaData_values where assetId = ".
-							quote($self->getId)." and fieldId = ".quote($fieldId));
-			} else {
-				WebGUI::SQL->write("update metaData_values set value = ".quote($session{form}{$form})."
-							where assetId = ".quote($self->getId)." and fieldId = ".
-							quote($fieldId));
-			}
-		}
-	}
 	WebGUI::SQL->commit;
 }
 
diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm
index f1c7953bf..b6bd3316f 100644
--- a/lib/WebGUI/Asset/Post.pm
+++ b/lib/WebGUI/Asset/Post.pm
@@ -625,6 +625,7 @@ sub processPropertiesFromFormPost {
 		}
 		%data = (
 			ownerUserId => $session{user}{userId},
+			username => $session{form}{visitorName} || $session{user}{alias} || $session{user}{username},
 			isHidden => 1,
 			dateSubmitted=>time()
 			);