From a50a1906424699e622bb0ec96d4288f1343facae Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Fri, 17 Feb 2006 22:53:54 +0000
Subject: [PATCH] Working on making this work again

---
 lib/WebGUI/Operation/User.pm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm
index 69e5caa6a..70c3bb4d2 100644
--- a/lib/WebGUI/Operation/User.pm
+++ b/lib/WebGUI/Operation/User.pm
@@ -285,6 +285,7 @@ sub www_editUser {
 	my $session = shift;
 	return $session->privilege->adminOnly() unless ($session->user->isInGroup(11));
 	my $error = shift;
+	my $uid = shift || $session->form->process("uid");
 	my $i18n = WebGUI::International->new($session, "WebGUI");
 	my %tabs;
 	tie %tabs, 'Tie::IxHash';
@@ -294,7 +295,9 @@ sub www_editUser {
 		"groups"=> { label=>$i18n->get('89')},
 		);
 	my $tabform = WebGUI::TabForm->new($session,\%tabs);
-	my $u = WebGUI::User->new($session,($session->form->process("uid") eq 'new') ? '' : $session->form->process("uid"));
+	
+	$uid = '' if ($uid eq 'new');
+	my $u = WebGUI::User->new($session,$uid);
 	$session->style->setScript($session->config->get("extrasURL")."/swapLayers.js", {type=>"text/javascript"});
 	$session->style->setRawHeadTags('<script type="text/javascript">var active="'.$u->authMethod.'";</script>');
     	$tabform->hidden({name=>"op",value=>"editUserSave"});
@@ -402,7 +405,13 @@ sub www_editUserSave {
 	my $error;
 	if (($uid eq $session->form->process("uid") || $uid eq "") && $session->form->process("username") ne '') {
 	   	my $u = WebGUI::User->new($session,$session->form->process("uid"));
-		$session->form->process("uid") = $u->userId unless ( $isAdmin ||$isSecondary);
+
+	   	#many were asked but none could determine what the hell this next line was trying to accomplish
+	   	#we think you were trying to set the uid session variable and others think you actually meant
+	   	#to set the uid via the $user object.  Anyways, you can't do either of those things.
+	   	#
+		#$session->form->process("uid") = $u->userId unless ( $isAdmin ||$isSecondary);
+
 	   	$u->username($session->form->process("username"));
 	   	$u->authMethod($session->form->process("authMethod"));
 	   	$u->status($session->form->process("status"));
@@ -424,7 +433,7 @@ sub www_editUserSave {
 	if ($isSecondary) {
 		return _submenu($session,$i18n->get(978));
 	} else {
-		return www_editUser($session,$error);
+		return www_editUser($session,$error,$uid);
 	}
 }