From 4b3c19ce744d65e6b37a1d0c2ac702f9e7e766ee Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Sun, 9 Feb 2003 04:06:53 +0000
Subject: [PATCH] fixed bug 677283

---
 docs/upgrades/upgrade_5.0.3-5.1.0.sql |  4 ++--
 lib/WebGUI/Operation/Account.pm       | 10 +++++++---
 lib/WebGUI/Operation/User.pm          |  8 +++++++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/upgrades/upgrade_5.0.3-5.1.0.sql b/docs/upgrades/upgrade_5.0.3-5.1.0.sql
index bee5a68d9..fb09e03a2 100644
--- a/docs/upgrades/upgrade_5.0.3-5.1.0.sql
+++ b/docs/upgrades/upgrade_5.0.3-5.1.0.sql
@@ -9,8 +9,8 @@ insert into international (internationalId,languageId,namespace,message,lastUpda
 insert into international (internationalId,languageId,namespace,message,lastUpdated) values (858,1,'WebGUI','Alias', 1043879848);
 INSERT INTO userProfileField VALUES ('alias','WebGUI::International::get(858)',1,0,'text','','',4,3,0);
 INSERT INTO userProfileField VALUES ('signature','WebGUI::International::get(859)',1,0,'HTMLArea','','',5,3,0);
-INSERT INTO userProfileField VALUES ('publicProfile','WebGUI::International::get(861)',1,0,'yesNo','','[1]',9,4,0);
-INSERT INTO userProfileField VALUES ('publicEmail','WebGUI::International::get(860)',1,0,'yesNo','','[1]',10,4,0);
+INSERT INTO userProfileField VALUES ('publicProfile','WebGUI::International::get(861)',1,0,'yesNo','','1',9,4,0);
+INSERT INTO userProfileField VALUES ('publicEmail','WebGUI::International::get(860)',1,0,'yesNo','','1',10,4,0);
 insert into international (internationalId,languageId,namespace,message,lastUpdated) values (862,1,'WebGUI','This user\'s profile is not public.', 1043881275);
 alter table groups add column dateCreated int not null default 997938000;
 alter table groups add column lastUpdated int not null default 997938000;
diff --git a/lib/WebGUI/Operation/Account.pm b/lib/WebGUI/Operation/Account.pm
index 8cb972d0b..e91aed676 100644
--- a/lib/WebGUI/Operation/Account.pm
+++ b/lib/WebGUI/Operation/Account.pm
@@ -320,9 +320,13 @@ sub www_editProfile {
 						-subtext=>$subtext
 						);
                                 } else {
-                                        $default = $session{form}{$data{fieldName}}
-                                                || $session{user}{$data{fieldName}}
-                                                || eval $data{dataDefault};
+					if ($session{form}{$data{fieldName}}) {
+						$default = $session{form}{$data{fieldName}};
+					} elsif (exists $session{user}{$data{fieldName}}) {
+						$default = $session{user}{$data{fieldName}};
+					} else {
+						$default = eval $data{dataDefault};
+					}
                                         $f->$method(
 						-name=>$data{fieldName},
 						-label=>$label,
diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index c700f0dca..c1766d3ea 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -356,7 +356,13 @@ sub www_editUserProfile {
                         }
                  	$f->select($data{fieldName},$values,$label,$default);
                 } elsif ($method) {
-                        $default = $session{form}{$data{fieldName}} || $user{$data{fieldName}} || eval $data{dataDefault};
+			if ($session{form}{$data{fieldName}}) {
+                        	$default = $session{form}{$data{fieldName}};
+                        } elsif (exists $session{user}{$data{fieldName}}) {
+                                $default = $user{$data{fieldName}};
+                        } else {
+                                $default = eval $data{dataDefault};
+                        }
                         $f->$method($data{fieldName},$label,$default);
                 }
                 $previousCategory = $category;