From 6944fe33166d5558f928b24f152b2f44dfba02e9 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Fri, 16 Dec 2005 16:28:21 +0000
Subject: [PATCH]  - fix [ 1381694 ] Unable to reset votes on poll  - fix [
 1381309 ] FormParam macro returns always undef  - fix [ 1379595 ] http proxy
 broken  - fix [ 1379060 ] Unable to view subscription codes

---
 docs/changelog/6.x.x.txt                    | 4 ++++
 docs/upgrades/upgrade_6.8.2-6.8.3.pl        | 1 +
 lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm | 5 +++++
 lib/WebGUI/Asset/Wobject/Poll.pm            | 2 +-
 lib/WebGUI/DateTime.pm                      | 4 +++-
 lib/WebGUI/Macro/FormParam.pm               | 2 +-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 351eb0758..b3fb991da 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -5,6 +5,10 @@
  - fix [ 1381551 ] epochToHuman for foreign languages
  - fix [ 1381305 ] SQLReports report nothing!!!
  - fix [ 1381873 ] Matrix missing toolbar
+ - fix [ 1381694 ] Unable to reset votes on poll
+ - fix [ 1381309 ] FormParam macro returns always undef
+ - fix [ 1379595 ] http proxy broken
+ - fix [ 1379060 ] Unable to view subscription codes
 
 
 6.8.2
diff --git a/docs/upgrades/upgrade_6.8.2-6.8.3.pl b/docs/upgrades/upgrade_6.8.2-6.8.3.pl
index 2d8e79e56..f1978943b 100644
--- a/docs/upgrades/upgrade_6.8.2-6.8.3.pl
+++ b/docs/upgrades/upgrade_6.8.2-6.8.3.pl
@@ -14,6 +14,7 @@ use Getopt::Long;
 use WebGUI::Session;
 use WebGUI::SQL;
 use WebGUI::Asset;
+use Parse::PlainConfig;
 
 my $toVersion = "6.8.3"; # make this match what version you're going to
 my $quiet; # this line required
diff --git a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
index fea1a0130..4f2291476 100644
--- a/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
+++ b/lib/WebGUI/Asset/Wobject/HttpProxy/Parse.pm
@@ -37,6 +37,11 @@ my %tag_attr = (
 	"script src" => 1
 	);
 
+sub DESTROY {
+	my $self = shift;
+	$self = undef;
+}
+
 sub new {
   	my $pack = shift;
   	my $self = $pack->SUPER::new();
diff --git a/lib/WebGUI/Asset/Wobject/Poll.pm b/lib/WebGUI/Asset/Wobject/Poll.pm
index 70d6bbcf9..176eddc08 100644
--- a/lib/WebGUI/Asset/Wobject/Poll.pm
+++ b/lib/WebGUI/Asset/Wobject/Poll.pm
@@ -238,7 +238,7 @@ sub getEditForm {
 		-name=>"resetVotes",
 		-label=>WebGUI::International::get(10,"Asset_Poll"),
 		-hoverHelp=>WebGUI::International::get('10 description',"Asset_Poll")
-		) if $session{form}{func} eq 'add';
+		) if $session{form}{func} ne 'add';
 	return $tabform;
 }
 
diff --git a/lib/WebGUI/DateTime.pm b/lib/WebGUI/DateTime.pm
index c4ba1e1dc..d4d341628 100644
--- a/lib/WebGUI/DateTime.pm
+++ b/lib/WebGUI/DateTime.pm
@@ -130,7 +130,9 @@ The number of seconds to add to the epoch.
 =cut
 
 sub addToTime {
-	my $date		= DateTime->from_epoch( epoch =>shift);
+	my $epoch = shift;
+	return undef unless $epoch;
+	my $date		= DateTime->from_epoch( epoch =>$epoch);
 	my $hours 		= shift || 0;
 	my $mins	 	= shift || 0;
 	my $secs	 	= shift || 0;
diff --git a/lib/WebGUI/Macro/FormParam.pm b/lib/WebGUI/Macro/FormParam.pm
index e0ac5b172..0177fd60e 100644
--- a/lib/WebGUI/Macro/FormParam.pm
+++ b/lib/WebGUI/Macro/FormParam.pm
@@ -15,7 +15,7 @@ use WebGUI::Session;
 
 #-------------------------------------------------------------------
 sub process {
-	return $session{form}{shift};
+	return $session{req}->param(shift) if ($session{req});
 }