From f8f797fa24b88ff77276e4413fc90b0d5f9295d4 Mon Sep 17 00:00:00 2001
From: Kaleb Murphy <perlmonkey2@webgui-svn>
Date: Tue, 9 Sep 2008 15:09:45 +0000
Subject: [PATCH] Sent email from field now prefixed with username

---
 docs/changelog/7.x.x.txt | 1 +
 lib/WebGUI/Mail/Send.pm  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 53e011270..0213a6545 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -28,6 +28,7 @@
  - fixed: Settings - Show Message On Login behaviour
  - fixed: Page Layout templates generate invalid HTML with description
  - fixed: Form/Integer now shows 0 in the results page
+ - added: Email from field now prefixed with username
 
 7.5.22
  - fixed: Layout template now gets prepared correctly
diff --git a/lib/WebGUI/Mail/Send.pm b/lib/WebGUI/Mail/Send.pm
index 88f54e173..228f62033 100644
--- a/lib/WebGUI/Mail/Send.pm
+++ b/lib/WebGUI/Mail/Send.pm
@@ -286,7 +286,7 @@ sub create {
 			}	
 		}
 	}
-	my $from    = $headers->{from} || $session->setting->get("companyEmail");
+    my $from    = $headers->{from} || $session->user->username." <".$session->setting->get("companyEmail").">";
 	my $type    = $headers->{contentType} || "multipart/mixed";
     my $replyTo = $headers->{replyTo} ||  $session->setting->get("mailReturnPath");