From 8023b834363192e0407bf4440c40198a12180f72 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 12 Mar 2003 04:12:17 +0000
Subject: [PATCH] Fixed a bug in the USS code related to the new wobject API.

---
 lib/WebGUI/Wobject.pm     | 12 ++++++------
 lib/WebGUI/Wobject/USS.pm | 20 +-------------------
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm
index 9b0b21654..882de385d 100644
--- a/lib/WebGUI/Wobject.pm
+++ b/lib/WebGUI/Wobject.pm
@@ -1300,15 +1300,15 @@ A hash reference of extra properties to set.
 sub www_editSave {
 	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
 	my %set;
-	foreach (keys %{$_[0]->{_wobjectProperties}}) {
-		if (exists $session{form}{$_}) {
-			$set{$_} = _validateField($_,$_[0]->{_wobjectProperties}{$_}{fieldType}) || $_[0]->{_wobjectProperties}{$_}{defaultValue};
+	foreach my $key (keys %{$_[0]->{_wobjectProperties}}) {
+		if (exists $session{form}{$key}) {
+			$set{$key} = _validateField($key,$_[0]->{_wobjectProperties}{$key}{fieldType}) || $_[0]->{_wobjectProperties}{$key}{defaultValue};
 		}
 	}
 	$set{title} = $session{form}{title} || $_[0]->name;
-	foreach (keys %{$_[0]->{_extendedProperties}}) {
-		if (exists $session{form}{$_}) {
-			$set{$_} = _validateField($_,$_[0]->{_extendedProperties}{$_}{fieldType}) || $_[0]->{_extendedProperties}{$_}{defaultValue};
+	foreach my $key (keys %{$_[0]->{_extendedProperties}}) {
+		if (exists $session{form}{$key}) {	
+			$set{$key} = _validateField($key,$_[0]->{_extendedProperties}{$key}{fieldType}) || $_[0]->{_extendedProperties}{$key}{defaultValue};
 		}
 	}
 	%set = (%set, %{$_[1]});
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index 1c1e3e433..4cba8e7df 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -64,7 +64,7 @@ sub new {
         my $property = shift;
         my $self = WebGUI::Wobject->new(
                 -properties=>$property,
-		-useDiscussion=>1<
+		-useDiscussion=>1,
                 -extendedProperties=>{
 			submissionsPerPage=>{
 				defaultValue=>50
@@ -87,9 +87,6 @@ sub new {
 			karmaPerSubmission=>{
 				defaultValue=>0
 				},
-			allowDiscussion=>{
-				defaultValue=>0
-				},
 			filterContent=>{
 				defaultValue=>"javascript"
 				}
@@ -252,21 +249,6 @@ sub www_edit {
 		);
 }
 
-#-------------------------------------------------------------------
-sub www_editSave {
-	return WebGUI::Privilege::insufficient() unless (WebGUI::Privilege::canEditPage());
-	$_[0]->SUPER::www_editSave({
-		submissionsPerPage=>$session{form}{submissionsPerPage},
-		groupToContribute=>$session{form}{groupToContribute},
-		groupToApprove=>$session{form}{groupToApprove},
-		defaultStatus=>$session{form}{defaultStatus},
-		karmaPerSubmission=>$session{form}{karmaPerSubmission},
-		templateId=>$session{form}{templateId},
-		submissionTemplateId=>$session{form}{submissionTemplateId},
-		filterContent=>$session{form}{filterContent}
-		});
-        return "";
-}
 
 #-------------------------------------------------------------------
 sub www_editSubmission {