From ad7e894fbc01ba2f7e0e3b9f69dc0bbaf87488b7 Mon Sep 17 00:00:00 2001
From: Roy Johnson <roy.l.johnson@gmail.com>
Date: Fri, 23 Jun 2006 15:14:10 +0000
Subject: [PATCH] fix - WG user not logged in Apache

---
 docs/changelog/6.x.x.txt | 1 +
 lib/WebGUI.pm            | 1 +
 lib/WebGUI/Session.pm    | 1 -
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index ffdd2abd3..095ddb842 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -16,6 +16,7 @@
  - fix: viewIndividualSurvey shows "Answer" lines in Survey mode
  - fix: Attachment label but no field in CS posts
  - fix: isInGroup now processes LDAP users correctly
+ - fix: WG user not logged in Apache
 
 6.99.4
  - fix: better checking of selected template type
diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index 703b245f1..c2bf13f70 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -93,6 +93,7 @@ sub contentHandler {
 	} elsif ($session->setting->get("specialState") eq "upgrading") {
 		upgrading($session);
 	} else {
+		$r->user($session->user->username); # Tell Apache who's getting this page
 		my $output = processOperations($session);
 		if ($output ne "") {
 			# do nothing because we have operation output to display
diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm
index c7df10ac9..00a7669aa 100644
--- a/lib/WebGUI/Session.pm
+++ b/lib/WebGUI/Session.pm
@@ -587,7 +587,6 @@ sub user {
 		}	
 		delete $self->{_stow};
 		$self->{_user} = $option->{user} || WebGUI::User->new($self, $userId);
-		$self->request->user($self->{_user}->username) if ($self->request);
 	} elsif (!exists $self->{_user}) {
 		$self->{_user} = WebGUI::User->new($self, $self->var->get('userId'));
 	}