From cc5248c8d691a86583c5b850ab59e0f5584a3d58 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Mon, 29 Sep 2003 21:36:36 +0000
Subject: [PATCH] caught an exception

---
 lib/WebGUI/Affiliate.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Affiliate.pm b/lib/WebGUI/Affiliate.pm
index 44201548d..bdb8c0681 100644
--- a/lib/WebGUI/Affiliate.pm
+++ b/lib/WebGUI/Affiliate.pm
@@ -24,10 +24,12 @@ use WebGUI::User;
 sub grabReferral {
 	if ($session{user}{userId} != 1 && $session{user}{referringAffiliate} > 0) {
 		return "";
-	} elsif ($session{user}{userId} != 1 && $session{user}{referringAffiliate} == 0 && $session{scratch}{referringAffiliate} > 0) {
+	} elsif ($session{user}{userId} != 1 && (($session{user}{referringAffiliate} == 0 && $session{scratch}{referringAffiliate} > 0) || $session{form}{affiliateId} ne "")) {
 		my $u = WebGUI::User->new($session{user}{userId});
 		$u->referringAffiliate($session{scratch}{referringAffiliate});
-		WebGUI::Session::deleteScratch("referringAffiliate");
+	} elsif ($session{user}{userId} != 1) {
+		my $u = WebGUI::User->new($session{user}{userId});
+		$u->referringAffiliate(1);
 	} elsif ($session{form}{affiliateId} ne "") {
 		WebGUI::Session::setScratch("referringAffiliate",$session{form}{affiliateId});
 	}