From 41f1025b8523664af9e7eb860a8f670b725efbaa Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 15 May 2002 01:14:21 +0000
Subject: [PATCH] User preferences default to defaults set in user profile
 manager if not set by the user individually.

---
 lib/WebGUI/Session.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index 4879f8e8e..a33a4890f 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -70,7 +70,7 @@ sub _getSessionVars {
 
 #-------------------------------------------------------------------
 sub _getUserInfo {
-	my (%user, $uid, %profile);
+	my (%default, $key, %user, $uid, %profile);
 	tie %user, 'Tie::CPHash';
 	$uid = $_[0] || 1;
 	%user = WebGUI::SQL->quickHash("select * from users where userId='$uid'", $_[1]);
@@ -79,7 +79,12 @@ sub _getUserInfo {
 	}
 	%profile = WebGUI::SQL->buildHash("select userProfileField.fieldName, userProfileData.fieldData from userProfileData, userProfileField where userProfileData.fieldName=userProfileField.fieldName and userProfileData.userId=$user{userId}", $_[1]);
 	%user = (%user, %profile);
-	$user{language} = 'English' if ($user{language} eq "");
+	%default = WebGUI::SQL->buildHash("select fieldName, dataDefault from userProfileField where profileCategoryId=4", $_[1]);
+	foreach $key (keys %default) {
+		if ($user{$key} eq "") {
+			$user{$key} = eval($default{$key});
+		}
+	}
 	return \%user;
 }