From 408ed97cea81643f7e47c6666f76f3bd80db25a8 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Tue, 14 Apr 2009 02:30:59 +0000
Subject: [PATCH] Use email_from_name when send the email.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@26404 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 product/CMFActivity/ActivityTool.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/product/CMFActivity/ActivityTool.py b/product/CMFActivity/ActivityTool.py
index b44762c82e..6aa1909e57 100644
--- a/product/CMFActivity/ActivityTool.py
+++ b/product/CMFActivity/ActivityTool.py
@@ -317,11 +317,13 @@ class Message:
     user_email = portal.getProperty('email_to_address',
                        portal.getProperty('email_from_address'))
 
+    email_from_name = portal.getProperty('email_from_name',
+                       portal.getProperty('email_from_address'))
     call_traceback = ''
     if self.call_traceback:
       call_traceback = 'Created at:\n%s' % self.call_traceback
 
-    mail_text = """From: %s
+    mail_text = """From: %s <%s>
 To: %s
 Subject: %s
 
@@ -338,7 +340,8 @@ Named Parameters: %r
 Exception: %s %s
 
 %s
-""" % (activity_tool.email_from_address, user_email, message, message,
+""" % (email_from_name, activity_tool.email_from_address, 
+       user_email, message, message,
        activity_tool.getCurrentNode(), self.user_name,
        '/'.join(self.object_path), self.method_id, self.args, self.kw,
        call_traceback, self.exc_type, self.exc_value, self.traceback)
-- 
2.30.9